Changeset 426 for GPL/trunk/alsa-kernel/drivers/serial-u16550.c

Timestamp:

May 9, 2009, 11:45:26 AM (16 years ago)

Author:

Paul Smedley

Message:

Update alsa-kernel to ALSA 1.0.20 level

File:

• GPL/trunk/alsa-kernel/drivers/serial-u16550.c (modified) (7 diffs)

GPL/trunk/alsa-kernel/drivers/serial-u16550.c

@@ -242 +242 @@
 
                 if (status & UART_LSR_OE)
-                        snd_printk("%s: Overrun on device at 0x%lx\n",
+                        snd_printk(KERN_WARNING
+                                   "%s: Overrun on device at 0x%lx\n",
                                uart->rmidi->name, uart->base);
         }
@@ -637 +638 @@
         } else {
                 if (!snd_uart16550_write_buffer(uart, midi_byte)) {
-                        snd_printk("%s: Buffer overrun on device at 0x%lx\n",
+                        snd_printk(KERN_WARNING
+                                   "%s: Buffer overrun on device at 0x%lx\n",
                                    uart->rmidi->name, uart->base);
                         return 0;
@@ -816 +818 @@
                 if (request_irq(irq, snd_uart16550_interrupt,
                                 IRQF_DISABLED, "Serial MIDI", uart)) {
-                        snd_printk("irq %d busy. Using Polling.\n", irq);
+                        snd_printk(KERN_WARNING
+                                   "irq %d busy. Using Polling.\n", irq);
                 } else {
                         uart->irq = irq;
@@ -920 +923 @@
                 break;
         default:
-                snd_printk("Adaptor type is out of range 0-%d (%d)\n",
+                snd_printk(KERN_ERR
+                           "Adaptor type is out of range 0-%d (%d)\n",
                            SNDRV_SERIAL_MAX_ADAPTOR, adaptor[dev]);
                 return -ENODEV;
@@ -926 +930 @@
 
         if (outs[dev] < 1 || outs[dev] > SNDRV_SERIAL_MAX_OUTS) {
-                snd_printk("Count of outputs is out of range 1-%d (%d)\n",
+                snd_printk(KERN_ERR
+                           "Count of outputs is out of range 1-%d (%d)\n",
                            SNDRV_SERIAL_MAX_OUTS, outs[dev]);
                 return -ENODEV;
@@ -932 +937 @@
 
         if (ins[dev] < 1 || ins[dev] > SNDRV_SERIAL_MAX_INS) {
-                snd_printk("Count of inputs is out of range 1-%d (%d)\n",
+                snd_printk(KERN_ERR
+                           "Count of inputs is out of range 1-%d (%d)\n",
                            SNDRV_SERIAL_MAX_INS, ins[dev]);
                 return -ENODEV;
@@ -958 +964 @@
                 goto _err;
 
-        sprintf(card->longname, "%s at 0x%lx, irq %d speed %d div %d outs %d ins %d adaptor %s droponfull %d",
+        sprintf(card->longname, "%s [%s] at %#lx, irq %d",
                 card->shortname,
+                adaptor_names[uart->adaptor],
                 uart->base,
-                uart->irq,
-                uart->speed,
-                (int)uart->divisor,
-                outs[dev],
-                ins[dev],
-                adaptor_names[uart->adaptor],
-                uart->drop_on_full);
+                uart->irq);
 
         snd_card_set_dev(card, &devptr->dev);