USB: remove info() macro from remaining usb drivers
Greg Kroah-Hartman [Mon, 18 Aug 2008 20:21:04 +0000 (13:21 -0700)]
USB should not be having it's own printk macros, so remove info() and
use the system-wide standard of dev_info() wherever possible.  In the
few places that will not work out, use a basic printk().

Clean up the remaining usages of this in the drivers/usb/ directory.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

drivers/usb/class/cdc-acm.c
drivers/usb/host/r8a66597-hcd.c
drivers/usb/image/mdc800.c

index c257453..d9c2b8d 100644 (file)
@@ -1454,7 +1454,8 @@ static int __init acm_init(void)
                return retval;
        }
 
-       info(DRIVER_VERSION ":" DRIVER_DESC);
+       printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+              DRIVER_DESC "\n");
 
        return 0;
 }
index 3a45ad2..2a9bec2 100644 (file)
@@ -760,10 +760,12 @@ static void enable_r8a66597_pipe_dma(struct r8a66597 *r8a66597,
                        if ((r8a66597->dma_map & (1 << i)) != 0)
                                continue;
 
-                       info("address %d, EndpointAddress 0x%02x use DMA FIFO",
-                            usb_pipedevice(urb->pipe),
-                            info->dir_in ? USB_ENDPOINT_DIR_MASK + info->epnum
-                                           : info->epnum);
+                       dev_info(&dev->udev->dev,
+                                "address %d, EndpointAddress 0x%02x use "
+                                "DMA FIFO\n", usb_pipedevice(urb->pipe),
+                                info->dir_in ?
+                                       USB_ENDPOINT_DIR_MASK + info->epnum
+                                       : info->epnum);
 
                        r8a66597->dma_map |= 1 << i;
                        dev->dma_map |= 1 << i;
@@ -2387,7 +2389,8 @@ static int __init r8a66597_init(void)
        if (usb_disabled())
                return -ENODEV;
 
-       info("driver %s, %s", hcd_name, DRIVER_VERSION);
+       printk(KERN_INFO KBUILD_MODNAME ": driver %s, %s\n", hcd_name,
+              DRIVER_VERSION);
        return platform_driver_register(&r8a66597_driver);
 }
 module_init(r8a66597_init);
index 228552b..dd432c8 100644 (file)
@@ -489,7 +489,7 @@ static int mdc800_usb_probe (struct usb_interface *intf,
        }
 
 
-       info ("Found Mustek MDC800 on USB.");
+       dev_info(&intf->dev, "Found Mustek MDC800 on USB.\n");
 
        mutex_lock(&mdc800->io_lock);
 
@@ -571,7 +571,7 @@ static void mdc800_usb_disconnect (struct usb_interface *intf)
                mdc800->dev = NULL;
                usb_set_intfdata(intf, NULL);
        }
-       info ("Mustek MDC800 disconnected from USB.");
+       dev_info(&intf->dev, "Mustek MDC800 disconnected from USB.\n");
 }
 
 
@@ -1020,7 +1020,8 @@ static int __init usb_mdc800_init (void)
        if (retval)
                goto cleanup_on_fail;
 
-       info (DRIVER_VERSION ":" DRIVER_DESC);
+       printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+              DRIVER_DESC "\n");
 
        return 0;