diff options
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/class/cdc-acm.c | 3 | ||||
-rw-r--r-- | drivers/usb/host/r8a66597-hcd.c | 13 | ||||
-rw-r--r-- | drivers/usb/image/mdc800.c | 7 |
3 files changed, 14 insertions, 9 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index c257453fa9de..d9c2b8dafd67 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c | |||
@@ -1454,7 +1454,8 @@ static int __init acm_init(void) | |||
1454 | return retval; | 1454 | return retval; |
1455 | } | 1455 | } |
1456 | 1456 | ||
1457 | info(DRIVER_VERSION ":" DRIVER_DESC); | 1457 | printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":" |
1458 | DRIVER_DESC "\n"); | ||
1458 | 1459 | ||
1459 | return 0; | 1460 | return 0; |
1460 | } | 1461 | } |
diff --git a/drivers/usb/host/r8a66597-hcd.c b/drivers/usb/host/r8a66597-hcd.c index 3a45ad275b41..2a9bec264ad3 100644 --- a/drivers/usb/host/r8a66597-hcd.c +++ b/drivers/usb/host/r8a66597-hcd.c | |||
@@ -760,10 +760,12 @@ static void enable_r8a66597_pipe_dma(struct r8a66597 *r8a66597, | |||
760 | if ((r8a66597->dma_map & (1 << i)) != 0) | 760 | if ((r8a66597->dma_map & (1 << i)) != 0) |
761 | continue; | 761 | continue; |
762 | 762 | ||
763 | info("address %d, EndpointAddress 0x%02x use DMA FIFO", | 763 | dev_info(&dev->udev->dev, |
764 | usb_pipedevice(urb->pipe), | 764 | "address %d, EndpointAddress 0x%02x use " |
765 | info->dir_in ? USB_ENDPOINT_DIR_MASK + info->epnum | 765 | "DMA FIFO\n", usb_pipedevice(urb->pipe), |
766 | : info->epnum); | 766 | info->dir_in ? |
767 | USB_ENDPOINT_DIR_MASK + info->epnum | ||
768 | : info->epnum); | ||
767 | 769 | ||
768 | r8a66597->dma_map |= 1 << i; | 770 | r8a66597->dma_map |= 1 << i; |
769 | dev->dma_map |= 1 << i; | 771 | dev->dma_map |= 1 << i; |
@@ -2387,7 +2389,8 @@ static int __init r8a66597_init(void) | |||
2387 | if (usb_disabled()) | 2389 | if (usb_disabled()) |
2388 | return -ENODEV; | 2390 | return -ENODEV; |
2389 | 2391 | ||
2390 | info("driver %s, %s", hcd_name, DRIVER_VERSION); | 2392 | printk(KERN_INFO KBUILD_MODNAME ": driver %s, %s\n", hcd_name, |
2393 | DRIVER_VERSION); | ||
2391 | return platform_driver_register(&r8a66597_driver); | 2394 | return platform_driver_register(&r8a66597_driver); |
2392 | } | 2395 | } |
2393 | module_init(r8a66597_init); | 2396 | module_init(r8a66597_init); |
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 | ||