1 files changed, 13 insertions, 10 deletions

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);