10 files changed, 47 insertions, 34 deletions

diff --git a/drivers/usb/misc/adutux.c b/drivers/usb/misc/adutux.c
index 965f6eaea6a0..92f58ccc8fb3 100644
--- a/drivers/usb/misc/adutux.c
+++ b/drivers/usb/misc/adutux.c
@@ -895,8 +895,9 @@ static int __init adu_init(void)
                 goto exit;
         }
 
-        info("adutux " DRIVER_DESC " " DRIVER_VERSION);
-        info("adutux is an experimental driver. Use at your own risk");
+        printk(KERN_INFO "adutux " DRIVER_DESC " " DRIVER_VERSION "\n");
+        printk(KERN_INFO "adutux is an experimental driver. "
+               "Use at your own risk\n");
 
 exit:
         dbg(2," %s : leave, return value %d", __func__, result);
diff --git a/drivers/usb/misc/cytherm.c b/drivers/usb/misc/cytherm.c
index 1cd9e7eba93b..68e1d1723873 100644
--- a/drivers/usb/misc/cytherm.c
+++ b/drivers/usb/misc/cytherm.c
@@ -428,7 +428,8 @@ static int __init usb_cytherm_init(void)
                 return result;
         }
 
-        info(DRIVER_VERSION ":" DRIVER_DESC);
+        printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+               DRIVER_DESC "\n");
         return 0;
 }
 
diff --git a/drivers/usb/misc/emi26.c b/drivers/usb/misc/emi26.c
index 4b994a0cd272..1ee72055f468 100644
--- a/drivers/usb/misc/emi26.c
+++ b/drivers/usb/misc/emi26.c
@@ -64,7 +64,7 @@ static int emi26_writememory (struct usb_device *dev, int address,
 static int emi26_set_reset (struct usb_device *dev, unsigned char reset_bit)
 {
         int response;
-        info("%s - %d", __func__, reset_bit);
+        dev_info(&dev->dev, "%s - %d\n", __func__, reset_bit);
         /* printk(KERN_DEBUG "%s - %d", __func__, reset_bit); */
         response = emi26_writememory (dev, CPUCS_REG, &reset_bit, 1, 0xa0);
         if (response < 0) {
@@ -254,7 +254,7 @@ static int emi26_probe(struct usb_interface *intf, const struct usb_device_id *i
 {
         struct usb_device *dev = interface_to_usbdev(intf);
 
-        info("%s start", __func__);
+        dev_info(&intf->dev, "%s start\n", __func__);
 
         emi26_load_firmware(dev);
 
diff --git a/drivers/usb/misc/emi62.c b/drivers/usb/misc/emi62.c
index 5d859ded5bbf..602ee05ba9ff 100644
--- a/drivers/usb/misc/emi62.c
+++ b/drivers/usb/misc/emi62.c
@@ -73,7 +73,7 @@ static int emi62_writememory(struct usb_device *dev, int address,
 static int emi62_set_reset (struct usb_device *dev, unsigned char reset_bit)
 {
         int response;
-        info("%s - %d", __func__, reset_bit);
+        dev_info(&dev->dev, "%s - %d\n", __func__, reset_bit);
         
         response = emi62_writememory (dev, CPUCS_REG, &reset_bit, 1, 0xa0);
         if (response < 0) {
@@ -271,7 +271,7 @@ static int emi62_probe(struct usb_interface *intf, const struct usb_device_id *i
         struct usb_device *dev = interface_to_usbdev(intf);
         dev_dbg(&intf->dev, "emi62_probe\n");
 
-        info("%s start", __func__);
+        dev_info(&intf->dev, "%s start\n", __func__);
 
         emi62_load_firmware(dev);
 
diff --git a/drivers/usb/misc/idmouse.c b/drivers/usb/misc/idmouse.c
index 4bcf7fb4e5da..6da8887538c7 100644
--- a/drivers/usb/misc/idmouse.c
+++ b/drivers/usb/misc/idmouse.c
@@ -403,14 +403,15 @@ static void idmouse_disconnect(struct usb_interface *interface)
                 mutex_unlock(&dev->lock);
         }
 
-        info("%s disconnected", DRIVER_DESC);
+        dev_info(&interface->dev, "disconnected\n");
 }
 
 static int __init usb_idmouse_init(void)
 {
         int result;
 
-        info(DRIVER_DESC " " DRIVER_VERSION);
+        printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+               DRIVER_DESC "\n");
 
         /* register this driver with the USB subsystem */
         result = usb_register(&idmouse_driver);
diff --git a/drivers/usb/misc/legousbtower.c b/drivers/usb/misc/legousbtower.c
index 9370326a5940..ab0f3226158b 100644
--- a/drivers/usb/misc/legousbtower.c
+++ b/drivers/usb/misc/legousbtower.c
@@ -851,9 +851,8 @@ static int tower_probe (struct usb_interface *interface, const struct usb_device
 
         dbg(2, "%s: enter", __func__);
 
-        if (udev == NULL) {
-                info ("udev is NULL.");
-        }
+        if (udev == NULL)
+                dev_info(&interface->dev, "udev is NULL.\n");
 
         /* allocate memory for our device state and initialize it */
 
@@ -954,7 +953,9 @@ static int tower_probe (struct usb_interface *interface, const struct usb_device
         dev->minor = interface->minor;
 
         /* let the user know what node this device is now attached to */
-        info ("LEGO USB Tower #%d now attached to major %d minor %d", (dev->minor - LEGO_USB_TOWER_MINOR_BASE), USB_MAJOR, dev->minor);
+        dev_info(&interface->dev, "LEGO USB Tower #%d now attached to major "
+                 "%d minor %d\n", (dev->minor - LEGO_USB_TOWER_MINOR_BASE),
+                 USB_MAJOR, dev->minor);
 
         /* get the firmware version and log it */
         result = usb_control_msg (udev,
@@ -971,10 +972,10 @@ static int tower_probe (struct usb_interface *interface, const struct usb_device
                 retval = result;
                 goto error;
         }
-        info("LEGO USB Tower firmware version is %d.%d build %d",
-             get_version_reply.major,
-             get_version_reply.minor,
-             le16_to_cpu(get_version_reply.build_no));
+        dev_info(&interface->dev, "LEGO USB Tower firmware version is %d.%d "
+                 "build %d\n", get_version_reply.major,
+                 get_version_reply.minor,
+                 le16_to_cpu(get_version_reply.build_no));
 
 
 exit:
@@ -1021,7 +1022,8 @@ static void tower_disconnect (struct usb_interface *interface)
                 mutex_unlock(&dev->lock);
         }
 
-        info("LEGO USB Tower #%d now disconnected", (minor - LEGO_USB_TOWER_MINOR_BASE));
+        dev_info(&interface->dev, "LEGO USB Tower #%d now disconnected\n",
+                 (minor - LEGO_USB_TOWER_MINOR_BASE));
 
         dbg(2, "%s: leave", __func__);
 }
@@ -1046,7 +1048,8 @@ static int __init lego_usb_tower_init(void)
                 goto exit;
         }
 
-        info(DRIVER_DESC " " DRIVER_VERSION);
+        printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+               DRIVER_DESC "\n");
 
 exit:
         dbg(2, "%s: leave, return value %d", __func__, retval);
diff --git a/drivers/usb/misc/rio500.c b/drivers/usb/misc/rio500.c
index 248a12aacef6..deb95bb49fd1 100644
--- a/drivers/usb/misc/rio500.c
+++ b/drivers/usb/misc/rio500.c
@@ -89,7 +89,7 @@ static int open_rio(struct inode *inode, struct file *file)
 
         mutex_unlock(&(rio->lock));
 
-        info("Rio opened.");
+        dev_info(&rio->rio_dev->dev, "Rio opened.\n");
 
         return 0;
 }
@@ -100,7 +100,7 @@ static int close_rio(struct inode *inode, struct file *file)
 
         rio->isopen = 0;
 
-        info("Rio closed.");
+        dev_info(&rio->rio_dev->dev, "Rio closed.\n");
         return 0;
 }
 
@@ -451,7 +451,7 @@ static int probe_rio(struct usb_interface *intf,
         struct rio_usb_data *rio = &rio_instance;
         int retval;
 
-        info("USB Rio found at address %d", dev->devnum);
+        dev_info(&intf->dev, "USB Rio found at address %d\n", dev->devnum);
 
         retval = usb_register_dev(intf, &usb_rio_class);
         if (retval) {
@@ -503,7 +503,7 @@ static void disconnect_rio(struct usb_interface *intf)
                 kfree(rio->ibuf);
                 kfree(rio->obuf);
 
-                info("USB Rio disconnected.");
+                dev_info(&intf->dev, "USB Rio disconnected.\n");
 
                 rio->present = 0;
                 mutex_unlock(&(rio->lock));
@@ -531,7 +531,8 @@ static int __init usb_rio_init(void)
         if (retval)
                 goto out;
 
-        info(DRIVER_VERSION ":" DRIVER_DESC);
+        printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+               DRIVER_DESC "\n");
 
 out:
         return retval;
diff --git a/drivers/usb/misc/trancevibrator.c b/drivers/usb/misc/trancevibrator.c
index 03368edf3f22..2e14102955c5 100644
--- a/drivers/usb/misc/trancevibrator.c
+++ b/drivers/usb/misc/trancevibrator.c
@@ -144,7 +144,8 @@ static int __init tv_init(void)
                 return retval;
         }
 
-        info(DRIVER_VERSION ":" DRIVER_DESC);
+        printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+               DRIVER_DESC "\n");
         return 0;
 }
 
diff --git a/drivers/usb/misc/usblcd.c b/drivers/usb/misc/usblcd.c
index d589324bb0d0..e0ff9ccd866b 100644
--- a/drivers/usb/misc/usblcd.c
+++ b/drivers/usb/misc/usblcd.c
@@ -359,12 +359,13 @@ static int lcd_probe(struct usb_interface *interface, const struct usb_device_id
 
         i = le16_to_cpu(dev->udev->descriptor.bcdDevice);
 
-        info("USBLCD Version %1d%1d.%1d%1d found at address %d",
-                (i & 0xF000)>>12,(i & 0xF00)>>8,(i & 0xF0)>>4,(i & 0xF),
-                dev->udev->devnum);
+        dev_info(&interface->dev, "USBLCD Version %1d%1d.%1d%1d found "
+                 "at address %d\n", (i & 0xF000)>>12, (i & 0xF00)>>8,
+                 (i & 0xF0)>>4,(i & 0xF), dev->udev->devnum);
 
         /* let the user know what node this device is now attached to */
-        info("USB LCD device now attached to USBLCD-%d", interface->minor);
+        dev_info(&interface->dev, "USB LCD device now attached to USBLCD-%d\n",
+                 interface->minor);
         return 0;
 
 error:
@@ -413,7 +414,7 @@ static void lcd_disconnect(struct usb_interface *interface)
         /* decrement our usage count */
         kref_put(&dev->kref, lcd_delete);
 
-        info("USB LCD #%d now disconnected", minor);
+        dev_info(&interface->dev, "USB LCD #%d now disconnected\n", minor);
 }
 
 static struct usb_driver lcd_driver = {
diff --git a/drivers/usb/misc/uss720.c b/drivers/usb/misc/uss720.c
index 594f3e4e8c2e..9a6c27a01793 100644
--- a/drivers/usb/misc/uss720.c
+++ b/drivers/usb/misc/uss720.c
@@ -801,10 +801,14 @@ static int __init uss720_init(void)
         if (retval)
                 goto out;
 
-        info(DRIVER_VERSION ":" DRIVER_DESC);
-        info("NOTE: this is a special purpose driver to allow nonstandard");
-        info("protocols (eg. bitbang) over USS720 usb to parallel cables");
-        info("If you just want to connect to a printer, use usblp instead");
+        printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+               DRIVER_DESC "\n");
+        printk(KERN_INFO KBUILD_MODNAME ": NOTE: this is a special purpose "
+               "driver to allow nonstandard\n");
+        printk(KERN_INFO KBUILD_MODNAME ": protocols (eg. bitbang) over "
+               "USS720 usb to parallel cables\n");
+        printk(KERN_INFO KBUILD_MODNAME ": If you just want to connect to a "
+               "printer, use usblp instead\n");
 out:
         return retval;
 }