]> www.infradead.org Git - users/willy/linux.git/commitdiff
ALSA: serial-u16550: Use standard print API
authorTakashi Iwai <tiwai@suse.de>
Wed, 7 Aug 2024 13:33:58 +0000 (15:33 +0200)
committerTakashi Iwai <tiwai@suse.de>
Thu, 8 Aug 2024 05:47:23 +0000 (07:47 +0200)
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: Jaroslav Kysela <perex@perex.cz>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link: https://patch.msgid.link/20240807133452.9424-9-tiwai@suse.de
sound/drivers/serial-u16550.c

index 3cbc7a4adcb46443baf422840c885a2dff5eb34e..f66e01624c68ab23d13ee38b1bbaeebaa6259861 100644 (file)
@@ -224,9 +224,9 @@ static void snd_uart16550_io_loop(struct snd_uart16550 * uart)
                        snd_rawmidi_receive(uart->midi_input[substream], &c, 1);
 
                if (status & UART_LSR_OE)
-                       snd_printk(KERN_WARNING
-                                  "%s: Overrun on device at 0x%lx\n",
-                              uart->rmidi->name, uart->base);
+                       dev_warn(uart->card->dev,
+                                "%s: Overrun on device at 0x%lx\n",
+                                uart->rmidi->name, uart->base);
        }
 
        /* remember the last stream */
@@ -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")) {
-               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;
        }
 
@@ -619,9 +620,9 @@ static int snd_uart16550_output_byte(struct snd_uart16550 *uart,
                }
        } else {
                if (!snd_uart16550_write_buffer(uart, midi_byte)) {
-                       snd_printk(KERN_WARNING
-                                  "%s: Buffer overrun on device at 0x%lx\n",
-                                  uart->rmidi->name, uart->base);
+                       dev_warn(uart->card->dev,
+                                "%s: Buffer overrun on device at 0x%lx\n",
+                                uart->rmidi->name, uart->base);
                        return 0;
                }
        }
@@ -775,15 +776,15 @@ static int snd_uart16550_create(struct snd_card *card,
 
        err = snd_uart16550_detect(uart);
        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;
        }
 
        if (irq >= 0 && irq != SNDRV_AUTO_IRQ) {
                if (devm_request_irq(card->dev, irq, snd_uart16550_interrupt,
                                     0, "Serial MIDI", uart)) {
-                       snd_printk(KERN_WARNING
-                                  "irq %d busy. Using Polling.\n", irq);
+                       dev_warn(card->dev,
+                                "irq %d busy. Using Polling.\n", irq);
                } else {
                        uart->irq = irq;
                }
@@ -879,23 +880,23 @@ static int snd_serial_probe(struct platform_device *devptr)
        case SNDRV_SERIAL_GENERIC:
                break;
        default:
-               snd_printk(KERN_ERR
-                          "Adaptor type is out of range 0-%d (%d)\n",
-                          SNDRV_SERIAL_MAX_ADAPTOR, adaptor[dev]);
+               dev_err(&devptr->dev,
+                       "Adaptor type is out of range 0-%d (%d)\n",
+                       SNDRV_SERIAL_MAX_ADAPTOR, adaptor[dev]);
                return -ENODEV;
        }
 
        if (outs[dev] < 1 || outs[dev] > SNDRV_SERIAL_MAX_OUTS) {
-               snd_printk(KERN_ERR
-                          "Count of outputs is out of range 1-%d (%d)\n",
-                          SNDRV_SERIAL_MAX_OUTS, outs[dev]);
+               dev_err(&devptr->dev,
+                       "Count of outputs is out of range 1-%d (%d)\n",
+                       SNDRV_SERIAL_MAX_OUTS, outs[dev]);
                return -ENODEV;
        }
 
        if (ins[dev] < 1 || ins[dev] > SNDRV_SERIAL_MAX_INS) {
-               snd_printk(KERN_ERR
-                          "Count of inputs is out of range 1-%d (%d)\n",
-                          SNDRV_SERIAL_MAX_INS, ins[dev]);
+               dev_err(&devptr->dev,
+                       "Count of inputs is out of range 1-%d (%d)\n",
+                       SNDRV_SERIAL_MAX_INS, ins[dev]);
                return -ENODEV;
        }
 
@@ -975,7 +976,7 @@ static int __init alsa_card_serial_init(void)
        }
        if (! cards) {
 #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
                snd_serial_unregister_all();
                return -ENODEV;