USB: remove use of err() in drivers/usb/serial

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

diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c
index 22837a3f2f899e963f0d944814d222bcd2e494f5..eae4740d448c22c35d4fcdfd3fcf6e9b9bc2a5b5 100644 (file)
--- a/drivers/usb/serial/cypress_m8.c
+++ b/drivers/usb/serial/cypress_m8.c
@@ -404,8 +404,8 @@ static int cypress_serial_control(struct tty_struct *tty,
                         retval != -ENODEV);
 
                if (retval != sizeof(feature_buffer)) {
-                       err("%s - failed sending serial line settings - %d",
-                                                       __func__, retval);
+                       dev_err(&port->dev, "%s - failed sending serial "
+                               "line settings - %d\n", __func__, retval);
                        cypress_set_dead(port);
                } else {
                        spin_lock_irqsave(&priv->lock, flags);
@@ -443,7 +443,8 @@ static int cypress_serial_control(struct tty_struct *tty,
                                                && retval != -ENODEV);
 
                if (retval != sizeof(feature_buffer)) {
-                       err("%s - failed to retrieve serial line settings - %d", __func__, retval);
+                       dev_err(&port->dev, "%s - failed to retrieve serial "
+                               "line settings - %d\n", __func__, retval);
                        cypress_set_dead(port);
                        return retval;
                } else {
@@ -476,8 +477,8 @@ static void cypress_set_dead(struct usb_serial_port *port)
        priv->comm_is_ok = 0;
        spin_unlock_irqrestore(&priv->lock, flags);
 
-       err("cypress_m8 suspending failing port %d - interval might be too short",
-           port->number);
+       dev_err(&port->dev, "cypress_m8 suspending failing port %d - "
+               "interval might be too short\n", port->number);
 }
 
 
@@ -679,7 +680,8 @@ static int cypress_open(struct tty_struct *tty,
 
        /* setup the port and start reading from the device */
        if (!port->interrupt_in_urb) {
-               err("%s - interrupt_in_urb is empty!", __func__);
+               dev_err(&port->dev, "%s - interrupt_in_urb is empty!\n",
+                       __func__);
                return -1;
        }
 
@@ -1107,8 +1109,8 @@ static void cypress_set_termios(struct tty_struct *tty,
                data_bits = 3;
                break;
        default:
-               err("%s - CSIZE was set, but not CS5-CS8",
-                               __func__);
+               dev_err(&port->dev, "%s - CSIZE was set, but not CS5-CS8\n",
+                       __func__);
                data_bits = 3;
        }
        spin_lock_irqsave(&priv->lock, flags);
@@ -1286,7 +1288,7 @@ static void cypress_read_int_callback(struct urb *urb)
        }
        spin_unlock_irqrestore(&priv->lock, flags);
 
-       tty = port->port.tty;
+       tty = tty_port_tty_get(&port->port);
        if (!tty) {
                dbg("%s - bad tty pointer - exiting", __func__);
                return;
@@ -1362,7 +1364,7 @@ static void cypress_read_int_callback(struct urb *urb)
                                        data[i]);
                        tty_insert_flip_char(tty, data[i], tty_flag);
                }
-               tty_flip_buffer_push(port->port.tty);
+               tty_flip_buffer_push(tty);
        }
 
        spin_lock_irqsave(&priv->lock, flags);
@@ -1371,6 +1373,7 @@ static void cypress_read_int_callback(struct urb *urb)
        spin_unlock_irqrestore(&priv->lock, flags);
 
 continue_read:
+       tty_kref_put(tty);
 
        /* Continue trying to always read... unless the port has closed. */
 
@@ -1657,7 +1660,8 @@ static int __init cypress_init(void)
        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: