32 files changed, 96 insertions, 63 deletions

diff --git a/drivers/usb/serial/belkin_sa.c b/drivers/usb/serial/belkin_sa.c
index 1913bc7c5f0..bb19f1c2e0d 100644
--- a/drivers/usb/serial/belkin_sa.c
+++ b/drivers/usb/serial/belkin_sa.c
@@ -187,7 +187,7 @@ static int belkin_sa_startup(struct usb_serial *serial)
         /* see comments at top of file */
         priv->bad_flow_control =
                 (le16_to_cpu(dev->descriptor.bcdDevice) <= 0x0206) ? 1 : 0;
-        info("bcdDevice: %04x, bfc: %d",
+        dev_info(&dev->dev, "bcdDevice: %04x, bfc: %d\n",
                                         le16_to_cpu(dev->descriptor.bcdDevice),
                                         priv->bad_flow_control);
 
@@ -577,7 +577,8 @@ static int __init belkin_sa_init(void)
         retval = usb_register(&belkin_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(&belkin_device);
diff --git a/drivers/usb/serial/cp2101.c b/drivers/usb/serial/cp2101.c
index 1279553381e..8008d0bc80a 100644
--- a/drivers/usb/serial/cp2101.c
+++ b/drivers/usb/serial/cp2101.c
@@ -753,7 +753,8 @@ static int __init cp2101_init(void)
         }
 
         /* Success */
-        info(DRIVER_DESC " " DRIVER_VERSION);
+        printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+               DRIVER_DESC "\n");
         return 0;
 }
 
diff --git a/drivers/usb/serial/cyberjack.c b/drivers/usb/serial/cyberjack.c
index 94ef36c4764..068680f9929 100644
--- a/drivers/usb/serial/cyberjack.c
+++ b/drivers/usb/serial/cyberjack.c
@@ -499,8 +499,9 @@ static int __init cyberjack_init(void)
         if (retval)
                 goto failed_usb_register;
 
-        info(DRIVER_VERSION " " DRIVER_AUTHOR);
-        info(DRIVER_DESC);
+        printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION " "
+               DRIVER_AUTHOR "\n");
+        printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_DESC "\n");
 
         return 0;
 failed_usb_register:
diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c
index f3514a91f91..e0ca809f75f 100644
--- a/drivers/usb/serial/cypress_m8.c
+++ b/drivers/usb/serial/cypress_m8.c
@@ -1658,7 +1658,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:
diff --git a/drivers/usb/serial/digi_acceleport.c b/drivers/usb/serial/digi_acceleport.c
index 5756ac6d6c9..ebc2918719a 100644
--- a/drivers/usb/serial/digi_acceleport.c
+++ b/drivers/usb/serial/digi_acceleport.c
@@ -1854,7 +1854,8 @@ static int __init digi_init(void)
         retval = usb_register(&digi_driver);
         if (retval)
                 goto failed_usb_register;
-        info(DRIVER_VERSION ":" DRIVER_DESC);
+        printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+               DRIVER_DESC "\n");
         return 0;
 failed_usb_register:
         usb_serial_deregister(&digi_acceleport_4_device);
diff --git a/drivers/usb/serial/empeg.c b/drivers/usb/serial/empeg.c
index 1072e847280..fdd28e940bc 100644
--- a/drivers/usb/serial/empeg.c
+++ b/drivers/usb/serial/empeg.c
@@ -519,7 +519,8 @@ static int __init empeg_init(void)
         if (retval)
                 goto failed_usb_register;
 
-        info(DRIVER_VERSION ":" DRIVER_DESC);
+        printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+               DRIVER_DESC "\n");
 
         return 0;
 failed_usb_register:
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 89dab5c3682..bcadb1f4f5d 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -1154,7 +1154,7 @@ static void ftdi_determine_type(struct usb_serial_port *port)
                 /* Assume its an FT232R  */
                 priv->chip_type = FT232RL;
         }
-        info("Detected %s", ftdi_chip_name[priv->chip_type]);
+        dev_info(&udev->dev, "Detected %s\n", ftdi_chip_name[priv->chip_type]);
 }
 
 
@@ -1410,7 +1410,8 @@ static int ftdi_jtag_probe(struct usb_serial *serial)
         dbg("%s", __func__);
 
         if (interface == udev->actconfig->interface[0]) {
-                info("Ignoring serial port reserved for JTAG");
+                dev_info(&udev->dev,
+                         "Ignoring serial port reserved for JTAG\n");
                 return -ENODEV;
         }
 
@@ -1428,7 +1429,8 @@ static int ftdi_mtxorb_hack_setup(struct usb_serial *serial)
 
         if (ep->enabled && ep_desc->wMaxPacketSize == 0) {
                 ep_desc->wMaxPacketSize = cpu_to_le16(0x40);
-                info("Fixing invalid wMaxPacketSize on read pipe");
+                dev_info(&serial->dev->dev,
+                         "Fixing invalid wMaxPacketSize on read pipe\n");
         }
 
         return 0;
@@ -2426,7 +2428,8 @@ static int __init ftdi_init(void)
         if (retval)
                 goto failed_usb_register;
 
-        info(DRIVER_VERSION ":" DRIVER_DESC);
+        printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+               DRIVER_DESC "\n");
         return 0;
 failed_usb_register:
         usb_serial_deregister(&ftdi_sio_device);
diff --git a/drivers/usb/serial/garmin_gps.c b/drivers/usb/serial/garmin_gps.c
index 2ad0569bcf1..8e6a66e38db 100644
--- a/drivers/usb/serial/garmin_gps.c
+++ b/drivers/usb/serial/garmin_gps.c
@@ -1585,7 +1585,8 @@ static int __init garmin_init(void)
         retval = usb_register(&garmin_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:
diff --git a/drivers/usb/serial/hp4x.c b/drivers/usb/serial/hp4x.c
index ab905869e95..43132927513 100644
--- a/drivers/usb/serial/hp4x.c
+++ b/drivers/usb/serial/hp4x.c
@@ -63,7 +63,8 @@ static int __init hp49gp_init(void)
         retval = usb_register(&hp49gp_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(&hp49gp_device);
diff --git a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c
index 611f97fd62f..eb95efdfbe8 100644
--- a/drivers/usb/serial/io_edgeport.c
+++ b/drivers/usb/serial/io_edgeport.c
@@ -3253,7 +3253,8 @@ static int __init edgeport_init(void)
         if (retval)
                 goto failed_usb_register;
         atomic_set(&CmdUrbs, 0);
-        info(DRIVER_DESC " " DRIVER_VERSION);
+        printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+               DRIVER_DESC "\n");
         return 0;
 
 failed_usb_register:
diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c
index 541dd8e6e7a..c3cdd00ddc4 100644
--- a/drivers/usb/serial/io_ti.c
+++ b/drivers/usb/serial/io_ti.c
@@ -2978,7 +2978,8 @@ static int __init edgeport_init(void)
         retval = usb_register(&io_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(&edgeport_2port_device);
diff --git a/drivers/usb/serial/ipaq.c b/drivers/usb/serial/ipaq.c
index 2affa9c118b..5108cbc64a5 100644
--- a/drivers/usb/serial/ipaq.c
+++ b/drivers/usb/serial/ipaq.c
@@ -976,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;
@@ -985,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);
diff --git a/drivers/usb/serial/ipw.c b/drivers/usb/serial/ipw.c
index 480cac27d64..3ac59a8a980 100644
--- a/drivers/usb/serial/ipw.c
+++ b/drivers/usb/serial/ipw.c
@@ -485,7 +485,8 @@ static int usb_ipw_init(void)
                 usb_serial_deregister(&ipw_device);
                 return retval;
         }
-        info(DRIVER_DESC " " DRIVER_VERSION);
+        printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+               DRIVER_DESC "\n");
         return 0;
 }
 
diff --git a/drivers/usb/serial/ir-usb.c b/drivers/usb/serial/ir-usb.c
index 45d4043e04a..b679a556b98 100644
--- a/drivers/usb/serial/ir-usb.c
+++ b/drivers/usb/serial/ir-usb.c
@@ -602,7 +602,8 @@ static int __init ir_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;
 
diff --git a/drivers/usb/serial/iuu_phoenix.c b/drivers/usb/serial/iuu_phoenix.c
index 53710aa7ead..e320972cb22 100644
--- a/drivers/usb/serial/iuu_phoenix.c
+++ b/drivers/usb/serial/iuu_phoenix.c
@@ -1185,7 +1185,8 @@ static int __init iuu_init(void)
         retval = usb_register(&iuu_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(&iuu_device);
diff --git a/drivers/usb/serial/keyspan.c b/drivers/usb/serial/keyspan.c
index 15447af4869..9878c0fb385 100644
--- a/drivers/usb/serial/keyspan.c
+++ b/drivers/usb/serial/keyspan.c
@@ -217,7 +217,8 @@ static int __init keyspan_init(void)
         if (retval)
                 goto failed_usb_register;
 
-        info(DRIVER_VERSION ":" DRIVER_DESC);
+        printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+               DRIVER_DESC "\n");
 
         return 0;
 failed_usb_register:
diff --git a/drivers/usb/serial/keyspan_pda.c b/drivers/usb/serial/keyspan_pda.c
index 99e9a14c5bf..2928ba84439 100644
--- a/drivers/usb/serial/keyspan_pda.c
+++ b/drivers/usb/serial/keyspan_pda.c
@@ -874,7 +874,8 @@ static int __init keyspan_pda_init(void)
         retval = usb_register(&keyspan_pda_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:
 #ifdef XIRCOM
diff --git a/drivers/usb/serial/kl5kusb105.c b/drivers/usb/serial/kl5kusb105.c
index ff3a07f5102..573c6972fae 100644
--- a/drivers/usb/serial/kl5kusb105.c
+++ b/drivers/usb/serial/kl5kusb105.c
@@ -183,11 +183,10 @@ static int klsi_105_chg_port_settings(struct usb_serial_port *port,
                         KLSI_TIMEOUT);
         if (rc < 0)
                 err("Change port settings failed (error = %d)", rc);
-        info("%s - %d byte block, baudrate %x, databits %d, u1 %d, u2 %d",
-            __func__,
-            settings->pktlen,
-            settings->baudrate, settings->databits,
-            settings->unknown1, settings->unknown2);
+        dev_info(&port->serial->dev->dev,
+                 "%d byte block, baudrate %x, databits %d, u1 %d, u2 %d\n",
+                 settings->pktlen, settings->baudrate, settings->databits,
+                 settings->unknown1, settings->unknown2);
         return rc;
 } /* klsi_105_chg_port_settings */
 
@@ -215,7 +214,7 @@ static int klsi_105_get_line_state(struct usb_serial_port *port,
         __u8 status_buf[KLSI_STATUSBUF_LEN] = { -1, -1};
         __u16 status;
 
-        info("%s - sending SIO Poll request", __func__);
+        dev_info(&port->serial->dev->dev, "sending SIO Poll request\n");
         rc = usb_control_msg(port->serial->dev,
                              usb_rcvctrlpipe(port->serial->dev, 0),
                              KL5KUSB105A_SIO_POLL,
@@ -230,8 +229,8 @@ static int klsi_105_get_line_state(struct usb_serial_port *port,
         else {
                 status = get_unaligned_le16(status_buf);
 
-                info("%s - read status %x %x", __func__,
-                     status_buf[0], status_buf[1]);
+                dev_info(&port->serial->dev->dev, "read status %x %x",
+                         status_buf[0], status_buf[1]);
 
                 *line_state_p = klsi_105_status2linestate(status);
         }
@@ -475,8 +474,9 @@ static void klsi_105_close(struct tty_struct *tty,
         /* FIXME */
         /* wgg - do I need this? I think so. */
         usb_kill_urb(port->interrupt_in_urb);
-        info("kl5kusb105 port stats: %ld bytes in, %ld bytes out",
-                                        priv->bytes_in, priv->bytes_out);
+        dev_info(&port->serial->dev->dev,
+                 "port stats: %ld bytes in, %ld bytes out\n",
+                 priv->bytes_in, priv->bytes_out);
 } /* klsi_105_close */
 
 
@@ -960,7 +960,8 @@ static int __init klsi_105_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:
         usb_serial_deregister(&kl5kusb105d_device);
diff --git a/drivers/usb/serial/kobil_sct.c b/drivers/usb/serial/kobil_sct.c
index cfcf37c2b95..6286baad939 100644
--- a/drivers/usb/serial/kobil_sct.c
+++ b/drivers/usb/serial/kobil_sct.c
@@ -744,8 +744,8 @@ static int __init kobil_init(void)
         if (retval)
                 goto failed_usb_register;
 
-        info(DRIVER_VERSION " " DRIVER_AUTHOR);
-        info(DRIVER_DESC);
+        printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+               DRIVER_DESC "\n");
 
         return 0;
 failed_usb_register:
diff --git a/drivers/usb/serial/mct_u232.c b/drivers/usb/serial/mct_u232.c
index 9b2cef81cde..29fa66ea2d2 100644
--- a/drivers/usb/serial/mct_u232.c
+++ b/drivers/usb/serial/mct_u232.c
@@ -817,7 +817,8 @@ static int __init mct_u232_init(void)
         retval = usb_register(&mct_u232_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(&mct_u232_device);
diff --git a/drivers/usb/serial/mos7720.c b/drivers/usb/serial/mos7720.c
index 7b538caec37..5711aa55d24 100644
--- a/drivers/usb/serial/mos7720.c
+++ b/drivers/usb/serial/mos7720.c
@@ -1585,7 +1585,8 @@ static int __init moschip7720_init(void)
         if (retval)
                 goto failed_port_device_register;
 
-        info(DRIVER_DESC " " DRIVER_VERSION);
+        printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+               DRIVER_DESC "\n");
 
         /* Register with the usb */
         retval = usb_register(&usb_driver);
diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c
index 60543d79ef5..d5f682626e7 100644
--- a/drivers/usb/serial/mos7840.c
+++ b/drivers/usb/serial/mos7840.c
@@ -2743,7 +2743,8 @@ static int __init moschip7840_init(void)
                 goto failed_port_device_register;
 
         dbg("%s\n", "Entring...");
-        info(DRIVER_DESC " " DRIVER_VERSION);
+        printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+               DRIVER_DESC "\n");
 
         /* Register with the usb */
         retval = usb_register(&io_driver);
diff --git a/drivers/usb/serial/omninet.c b/drivers/usb/serial/omninet.c
index c4d70b0f1e4..9890f26cd91 100644
--- a/drivers/usb/serial/omninet.c
+++ b/drivers/usb/serial/omninet.c
@@ -364,7 +364,8 @@ static int __init omninet_init(void)
         retval = usb_register(&omninet_driver);
         if (retval)
                 goto failed_usb_register;
-        info(DRIVER_VERSION ":" DRIVER_DESC);
+        printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+               DRIVER_DESC "\n");
         return 0;
 failed_usb_register:
         usb_serial_deregister(&zyxel_omninet_device);
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index 0d18a40a154..3d87eabcd92 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -420,7 +420,8 @@ static int __init option_init(void)
         if (retval)
                 goto failed_driver_register;
 
-        info(DRIVER_DESC ": " DRIVER_VERSION);
+        printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+               DRIVER_DESC "\n");
 
         return 0;
 
diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
index 90843784716..491c8857b64 100644
--- a/drivers/usb/serial/pl2303.c
+++ b/drivers/usb/serial/pl2303.c
@@ -1147,7 +1147,7 @@ static int __init pl2303_init(void)
         retval = usb_register(&pl2303_driver);
         if (retval)
                 goto failed_usb_register;
-        info(DRIVER_DESC);
+        printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_DESC "\n");
         return 0;
 failed_usb_register:
         usb_serial_deregister(&pl2303_device);
diff --git a/drivers/usb/serial/safe_serial.c b/drivers/usb/serial/safe_serial.c
index 72903ac9f5c..40cff61cb4a 100644
--- a/drivers/usb/serial/safe_serial.c
+++ b/drivers/usb/serial/safe_serial.c
@@ -250,8 +250,8 @@ static void safe_read_bulk_callback(struct urb *urb)
                 if (!fcs) {
                         int actual_length = data[length - 2] >> 2;
                         if (actual_length <= (length - 2)) {
-                                info("%s - actual: %d", __func__,
-                                                        actual_length);
+                                dev_info(&urb->dev->dev, "%s - actual: %d\n",
+                                         __func__, actual_length);
                                 tty_insert_flip_string(tty,
                                                         data, actual_length);
                                 tty_flip_buffer_push(tty);
@@ -428,14 +428,13 @@ static int __init safe_init(void)
 {
         int i, retval;
 
-        info(DRIVER_VERSION " " DRIVER_AUTHOR);
-        info(DRIVER_DESC);
-        info("vendor: %x product: %x safe: %d padded: %d\n",
-                                        vendor, product, safe, padded);
+        printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+               DRIVER_DESC "\n");
 
         /* if we have vendor / product parameters patch them into id list */
         if (vendor || product) {
-                info("vendor: %x product: %x\n", vendor, product);
+                printk(KERN_INFO KBUILD_MODNAME ": vendor: %x product: %x\n",
+                       vendor, product);
 
                 for (i = 0; i < ARRAY_SIZE(id_table); i++) {
                         if (!id_table[i].idVendor && !id_table[i].idProduct) {
diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c
index 6794e5721df..0f2b67244af 100644
--- a/drivers/usb/serial/sierra.c
+++ b/drivers/usb/serial/sierra.c
@@ -750,7 +750,8 @@ static int __init sierra_init(void)
         if (retval)
                 goto failed_driver_register;
 
-        info(DRIVER_DESC ": " DRIVER_VERSION);
+        printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+               DRIVER_DESC "\n");
 
         return 0;
 
diff --git a/drivers/usb/serial/spcp8x5.c b/drivers/usb/serial/spcp8x5.c
index 1533d6e1223..96aeec74619 100644
--- a/drivers/usb/serial/spcp8x5.c
+++ b/drivers/usb/serial/spcp8x5.c
@@ -1054,7 +1054,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);
diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c
index a9523b8348d..31c42d1cae1 100644
--- a/drivers/usb/serial/ti_usb_3410_5052.c
+++ b/drivers/usb/serial/ti_usb_3410_5052.c
@@ -382,7 +382,8 @@ static int __init ti_init(void)
         if (ret)
                 goto failed_usb;
 
-        info(TI_DRIVER_DESC " " TI_DRIVER_VERSION);
+        printk(KERN_INFO KBUILD_MODNAME ": " TI_DRIVER_VERSION ":"
+               TI_DRIVER_DESC "\n");
 
         return 0;
 
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index e7d4246027b..92ba4f7361e 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -1160,7 +1160,7 @@ static int __init usb_serial_init(void)
                 goto exit_generic;
         }
 
-        info(DRIVER_DESC);
+        printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_DESC "\n");
 
         return result;
 
@@ -1237,7 +1237,7 @@ int usb_serial_register(struct usb_serial_driver *driver)
                                                 retval, driver->description);
                 list_del(&driver->driver_list);
         } else
-                info("USB Serial support registered for %s",
+                printk(KERN_INFO "USB Serial support registered for %s\n",
                                                 driver->description);
 
         return retval;
@@ -1248,7 +1248,8 @@ EXPORT_SYMBOL_GPL(usb_serial_register);
 void usb_serial_deregister(struct usb_serial_driver *device)
 {
         /* must be called with BKL held */
-        info("USB Serial deregistering driver %s", device->description);
+        printk(KERN_INFO "USB Serial deregistering driver %s\n",
+               device->description);
         list_del(&device->driver_list);
         usb_serial_bus_deregister(device);
 }
diff --git a/drivers/usb/serial/visor.c b/drivers/usb/serial/visor.c
index a6d1c75a1c8..de4b5f0e7f3 100644
--- a/drivers/usb/serial/visor.c
+++ b/drivers/usb/serial/visor.c
@@ -971,11 +971,14 @@ static int __init visor_init(void)
                                 break;
                         }
                 }
-                info(
-                  "Untested USB device specified at time of module insertion");
-                info("Warning: This is not guaranteed to work");
-                info("Using a newer kernel is preferred to this method");
-                info("Adding Palm OS protocol 4.x support for unknown device: 0x%x/0x%x",
+                printk(KERN_INFO KBUILD_MODNAME
+                       ": Untested USB device specified at time of module insertion\n");
+                printk(KERN_INFO KBUILD_MODNAME
+                       ": Warning: This is not guaranteed to work\n");
+                printk(KERN_INFO KBUILD_MODNAME
+                       ": Using a newer kernel is preferred to this method\n");
+                printk(KERN_INFO KBUILD_MODNAME
+                       ": Adding Palm OS protocol 4.x support for unknown device: 0x%x/0x%x\n",
                         vendor, product);
         }
         retval = usb_serial_register(&handspring_device);
@@ -990,7 +993,7 @@ static int __init visor_init(void)
         retval = usb_register(&visor_driver);
         if (retval)
                 goto failed_usb_register;
-        info(DRIVER_DESC);
+        printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_DESC "\n");
 
         return 0;
 failed_usb_register:
diff --git a/drivers/usb/serial/whiteheat.c b/drivers/usb/serial/whiteheat.c
index 11c8b97a517..39f7f8d291d 100644
--- a/drivers/usb/serial/whiteheat.c
+++ b/drivers/usb/serial/whiteheat.c
@@ -452,8 +452,9 @@ static int whiteheat_attach(struct usb_serial *serial)
 
         hw_info = (struct whiteheat_hw_info *)&result[1];
 
-        info("%s: Driver %s: Firmware v%d.%02d", serial->type->description,
-             DRIVER_VERSION, hw_info->sw_major_rev, hw_info->sw_minor_rev);
+        dev_info(&serial->dev->dev, "%s: Driver %s: Firmware v%d.%02d\n",
+                 serial->type->description, DRIVER_VERSION,
+                 hw_info->sw_major_rev, hw_info->sw_minor_rev);
 
         for (i = 0; i < serial->num_ports; i++) {
                 port = serial->port[i];
@@ -1556,7 +1557,8 @@ static int __init whiteheat_init(void)
         retval = usb_register(&whiteheat_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(&whiteheat_device);