Merge branch 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

[linux-2.6-omap-h63xx.git] / drivers / usb / serial / spcp8x5.c

diff --git a/drivers/usb/serial/spcp8x5.c b/drivers/usb/serial/spcp8x5.c
index 1533d6e122387317b07576a74239009bc3be9296..a65bc2bd8e710f0cd32d61777de7c0630be9077a 100644 (file)
--- a/drivers/usb/serial/spcp8x5.c
+++ b/drivers/usb/serial/spcp8x5.c
@@ -589,8 +589,8 @@ static void spcp8x5_set_termios(struct tty_struct *tty,
        case 1000000:
                        buf[0] = 0x0b;  break;
        default:
-               err("spcp825 driver does not support the baudrate "
-                   "requested, using default of 9600.");
+               dev_err(&port->dev, "spcp825 driver does not support the "
+                       "baudrate requested, using default of 9600.\n");
        }
 
        /* Set Data Length : 00:5bit, 01:6bit, 10:7bit, 11:8bit */
@@ -629,7 +629,8 @@ static void spcp8x5_set_termios(struct tty_struct *tty,
                            SET_UART_FORMAT_TYPE, SET_UART_FORMAT,
                            uartdata, 0, NULL, 0, 100);
        if (i < 0)
-               err("Set UART format %#x failed (error = %d)", uartdata, i);
+               dev_err(&port->dev, "Set UART format %#x failed (error = %d)\n",
+                       uartdata, i);
        dbg("0x21:0x40:0:0  %d\n", i);
 
        if (cflag & CRTSCTS) {
@@ -1054,7 +1055,8 @@ static int __init spcp8x5_init(void)
        retval = usb_register(&spcp8x5_driver);
        if (retval)
                goto failed_usb_register;
-       info(DRIVER_DESC " " DRIVER_VERSION);
+       printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+              DRIVER_DESC "\n");
        return 0;
 failed_usb_register:
        usb_serial_deregister(&spcp8x5_device);