Commit 4d82bf10 authored by Takashi Iwai's avatar Takashi Iwai

ALSA: serial-u16550: Use standard print API

Use the standard print API with dev_*() instead of the old house-baked
one.  It gives better information and allows dynamically control of
debug prints.
Reviewed-by: default avatarJaroslav Kysela <perex@perex.cz>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Link: https://patch.msgid.link/20240807133452.9424-9-tiwai@suse.de
parent 7debf035
...@@ -224,7 +224,7 @@ static void snd_uart16550_io_loop(struct snd_uart16550 * uart) ...@@ -224,7 +224,7 @@ static void snd_uart16550_io_loop(struct snd_uart16550 * uart)
snd_rawmidi_receive(uart->midi_input[substream], &c, 1); snd_rawmidi_receive(uart->midi_input[substream], &c, 1);
if (status & UART_LSR_OE) if (status & UART_LSR_OE)
snd_printk(KERN_WARNING dev_warn(uart->card->dev,
"%s: Overrun on device at 0x%lx\n", "%s: Overrun on device at 0x%lx\n",
uart->rmidi->name, uart->base); uart->rmidi->name, uart->base);
} }
...@@ -323,7 +323,8 @@ static int snd_uart16550_detect(struct snd_uart16550 *uart) ...@@ -323,7 +323,8 @@ static int snd_uart16550_detect(struct snd_uart16550 *uart)
} }
if (!devm_request_region(uart->card->dev, io_base, 8, "Serial MIDI")) { if (!devm_request_region(uart->card->dev, io_base, 8, "Serial MIDI")) {
snd_printk(KERN_ERR "u16550: can't grab port 0x%lx\n", io_base); dev_err(uart->card->dev,
"u16550: can't grab port 0x%lx\n", io_base);
return -EBUSY; return -EBUSY;
} }
...@@ -619,7 +620,7 @@ static int snd_uart16550_output_byte(struct snd_uart16550 *uart, ...@@ -619,7 +620,7 @@ static int snd_uart16550_output_byte(struct snd_uart16550 *uart,
} }
} else { } else {
if (!snd_uart16550_write_buffer(uart, midi_byte)) { if (!snd_uart16550_write_buffer(uart, midi_byte)) {
snd_printk(KERN_WARNING dev_warn(uart->card->dev,
"%s: Buffer overrun on device at 0x%lx\n", "%s: Buffer overrun on device at 0x%lx\n",
uart->rmidi->name, uart->base); uart->rmidi->name, uart->base);
return 0; return 0;
...@@ -775,14 +776,14 @@ static int snd_uart16550_create(struct snd_card *card, ...@@ -775,14 +776,14 @@ static int snd_uart16550_create(struct snd_card *card,
err = snd_uart16550_detect(uart); err = snd_uart16550_detect(uart);
if (err <= 0) { if (err <= 0) {
printk(KERN_ERR "no UART detected at 0x%lx\n", iobase); dev_err(card->dev, "no UART detected at 0x%lx\n", iobase);
return -ENODEV; return -ENODEV;
} }
if (irq >= 0 && irq != SNDRV_AUTO_IRQ) { if (irq >= 0 && irq != SNDRV_AUTO_IRQ) {
if (devm_request_irq(card->dev, irq, snd_uart16550_interrupt, if (devm_request_irq(card->dev, irq, snd_uart16550_interrupt,
0, "Serial MIDI", uart)) { 0, "Serial MIDI", uart)) {
snd_printk(KERN_WARNING dev_warn(card->dev,
"irq %d busy. Using Polling.\n", irq); "irq %d busy. Using Polling.\n", irq);
} else { } else {
uart->irq = irq; uart->irq = irq;
...@@ -879,21 +880,21 @@ static int snd_serial_probe(struct platform_device *devptr) ...@@ -879,21 +880,21 @@ static int snd_serial_probe(struct platform_device *devptr)
case SNDRV_SERIAL_GENERIC: case SNDRV_SERIAL_GENERIC:
break; break;
default: default:
snd_printk(KERN_ERR dev_err(&devptr->dev,
"Adaptor type is out of range 0-%d (%d)\n", "Adaptor type is out of range 0-%d (%d)\n",
SNDRV_SERIAL_MAX_ADAPTOR, adaptor[dev]); SNDRV_SERIAL_MAX_ADAPTOR, adaptor[dev]);
return -ENODEV; return -ENODEV;
} }
if (outs[dev] < 1 || outs[dev] > SNDRV_SERIAL_MAX_OUTS) { if (outs[dev] < 1 || outs[dev] > SNDRV_SERIAL_MAX_OUTS) {
snd_printk(KERN_ERR dev_err(&devptr->dev,
"Count of outputs is out of range 1-%d (%d)\n", "Count of outputs is out of range 1-%d (%d)\n",
SNDRV_SERIAL_MAX_OUTS, outs[dev]); SNDRV_SERIAL_MAX_OUTS, outs[dev]);
return -ENODEV; return -ENODEV;
} }
if (ins[dev] < 1 || ins[dev] > SNDRV_SERIAL_MAX_INS) { if (ins[dev] < 1 || ins[dev] > SNDRV_SERIAL_MAX_INS) {
snd_printk(KERN_ERR dev_err(&devptr->dev,
"Count of inputs is out of range 1-%d (%d)\n", "Count of inputs is out of range 1-%d (%d)\n",
SNDRV_SERIAL_MAX_INS, ins[dev]); SNDRV_SERIAL_MAX_INS, ins[dev]);
return -ENODEV; return -ENODEV;
...@@ -975,7 +976,7 @@ static int __init alsa_card_serial_init(void) ...@@ -975,7 +976,7 @@ static int __init alsa_card_serial_init(void)
} }
if (! cards) { if (! cards) {
#ifdef MODULE #ifdef MODULE
printk(KERN_ERR "serial midi soundcard not found or device busy\n"); pr_err("serial midi soundcard not found or device busy\n");
#endif #endif
snd_serial_unregister_all(); snd_serial_unregister_all();
return -ENODEV; return -ENODEV;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment