diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-08-18 16:21:04 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-10-17 17:41:09 -0400 |
commit | 5909f6ea2bc7f785ceb1bed14c670946a536ff2d (patch) | |
tree | 79a12b6286d65f32f43f70be35ab2b6e17b3c350 /drivers/usb/image | |
parent | 1b29a375fb0b79a11a2d18e7bf5f6da422a35025 (diff) |
USB: remove info() macro from remaining usb drivers
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>
Diffstat (limited to 'drivers/usb/image')
-rw-r--r-- | drivers/usb/image/mdc800.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/usb/image/mdc800.c b/drivers/usb/image/mdc800.c index 228552beb534..dd432c8feaf8 100644 --- a/drivers/usb/image/mdc800.c +++ b/drivers/usb/image/mdc800.c | |||
@@ -489,7 +489,7 @@ static int mdc800_usb_probe (struct usb_interface *intf, | |||
489 | } | 489 | } |
490 | 490 | ||
491 | 491 | ||
492 | info ("Found Mustek MDC800 on USB."); | 492 | dev_info(&intf->dev, "Found Mustek MDC800 on USB.\n"); |
493 | 493 | ||
494 | mutex_lock(&mdc800->io_lock); | 494 | mutex_lock(&mdc800->io_lock); |
495 | 495 | ||
@@ -571,7 +571,7 @@ static void mdc800_usb_disconnect (struct usb_interface *intf) | |||
571 | mdc800->dev = NULL; | 571 | mdc800->dev = NULL; |
572 | usb_set_intfdata(intf, NULL); | 572 | usb_set_intfdata(intf, NULL); |
573 | } | 573 | } |
574 | info ("Mustek MDC800 disconnected from USB."); | 574 | dev_info(&intf->dev, "Mustek MDC800 disconnected from USB.\n"); |
575 | } | 575 | } |
576 | 576 | ||
577 | 577 | ||
@@ -1020,7 +1020,8 @@ static int __init usb_mdc800_init (void) | |||
1020 | if (retval) | 1020 | if (retval) |
1021 | goto cleanup_on_fail; | 1021 | goto cleanup_on_fail; |
1022 | 1022 | ||
1023 | info (DRIVER_VERSION ":" DRIVER_DESC); | 1023 | printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":" |
1024 | DRIVER_DESC "\n"); | ||
1024 | 1025 | ||
1025 | return 0; | 1026 | return 0; |
1026 | 1027 | ||