USB: remove info() macro from usb/serial drivers

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

diff --git a/drivers/usb/serial/ipaq.c b/drivers/usb/serial/ipaq.c
index cd9a2e138c8b35f3a3cacb4cd60525ed39d179b6..5108cbc64a55481ae8519521986c5872b24b1842 100644 (file)
--- a/drivers/usb/serial/ipaq.c
+++ b/drivers/usb/serial/ipaq.c
@@ -764,13 +764,14 @@ static void ipaq_read_bulk_callback(struct urb *urb)
        usb_serial_debug_data(debug, &port->dev, __func__,
                                                urb->actual_length, data);
 
-       tty = port->port.tty;
+       tty = tty_port_tty_get(&port->port);
        if (tty && urb->actual_length) {
                tty_buffer_request_room(tty, urb->actual_length);
                tty_insert_flip_string(tty, data, urb->actual_length);
                tty_flip_buffer_push(tty);
                bytes_in += urb->actual_length;
        }
+       tty_kref_put(tty);
 
        /* Continue trying to always read  */
        usb_fill_bulk_urb(port->read_urb, port->serial->dev,
@@ -975,7 +976,6 @@ static int __init ipaq_init(void)
        retval = usb_serial_register(&ipaq_device);
        if (retval)
                goto failed_usb_serial_register;
-       info(DRIVER_DESC " " DRIVER_VERSION);
        if (vendor) {
                ipaq_id_table[0].idVendor = vendor;
                ipaq_id_table[0].idProduct = product;
@@ -984,6 +984,8 @@ static int __init ipaq_init(void)
        if (retval)
                goto failed_usb_register;
 
+       printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+              DRIVER_DESC "\n");
        return 0;
 failed_usb_register:
        usb_serial_deregister(&ipaq_device);