diff options
author | Frank Seidel <frank@f-seidel.de> | 2009-02-05 10:16:24 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-03-24 19:20:30 -0400 |
commit | 6f8aa65b52037123beab573432e371c0f70b7b9a (patch) | |
tree | c83c7a4190f9f1f5c13c5332d316abc99efaecfd /drivers/usb/gadget | |
parent | c49cfa9170256295f4a0fd1668a2411fc05d6b33 (diff) |
USB: add missing KERN_* constants to printks
According to kerneljanitors todo list all printk calls (beginning
a new line) should have an according KERN_* constant.
Those are the missing peaces here for the usb subsystem.
Signed-off-by: Frank Seidel <frank@f-seidel.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/gadget')
-rw-r--r-- | drivers/usb/gadget/fsl_usb2_udc.c | 8 | ||||
-rw-r--r-- | drivers/usb/gadget/lh7a40x_udc.c | 16 |
2 files changed, 14 insertions, 10 deletions
diff --git a/drivers/usb/gadget/fsl_usb2_udc.c b/drivers/usb/gadget/fsl_usb2_udc.c index d8d9a52a44b3..9d7b95d4e3d2 100644 --- a/drivers/usb/gadget/fsl_usb2_udc.c +++ b/drivers/usb/gadget/fsl_usb2_udc.c | |||
@@ -1802,7 +1802,8 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver) | |||
1802 | 1802 | ||
1803 | out: | 1803 | out: |
1804 | if (retval) | 1804 | if (retval) |
1805 | printk("gadget driver register failed %d\n", retval); | 1805 | printk(KERN_WARNING "gadget driver register failed %d\n", |
1806 | retval); | ||
1806 | return retval; | 1807 | return retval; |
1807 | } | 1808 | } |
1808 | EXPORT_SYMBOL(usb_gadget_register_driver); | 1809 | EXPORT_SYMBOL(usb_gadget_register_driver); |
@@ -1847,7 +1848,8 @@ int usb_gadget_unregister_driver(struct usb_gadget_driver *driver) | |||
1847 | udc_controller->gadget.dev.driver = NULL; | 1848 | udc_controller->gadget.dev.driver = NULL; |
1848 | udc_controller->driver = NULL; | 1849 | udc_controller->driver = NULL; |
1849 | 1850 | ||
1850 | printk("unregistered gadget driver '%s'\n", driver->driver.name); | 1851 | printk(KERN_WARNING "unregistered gadget driver '%s'\n", |
1852 | driver->driver.name); | ||
1851 | return 0; | 1853 | return 0; |
1852 | } | 1854 | } |
1853 | EXPORT_SYMBOL(usb_gadget_unregister_driver); | 1855 | EXPORT_SYMBOL(usb_gadget_unregister_driver); |
@@ -2455,7 +2457,7 @@ module_init(udc_init); | |||
2455 | static void __exit udc_exit(void) | 2457 | static void __exit udc_exit(void) |
2456 | { | 2458 | { |
2457 | platform_driver_unregister(&udc_driver); | 2459 | platform_driver_unregister(&udc_driver); |
2458 | printk("%s unregistered\n", driver_desc); | 2460 | printk(KERN_WARNING "%s unregistered\n", driver_desc); |
2459 | } | 2461 | } |
2460 | 2462 | ||
2461 | module_exit(udc_exit); | 2463 | module_exit(udc_exit); |
diff --git a/drivers/usb/gadget/lh7a40x_udc.c b/drivers/usb/gadget/lh7a40x_udc.c index d554b0895603..6cd3d54f5640 100644 --- a/drivers/usb/gadget/lh7a40x_udc.c +++ b/drivers/usb/gadget/lh7a40x_udc.c | |||
@@ -432,8 +432,8 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver) | |||
432 | device_add(&dev->gadget.dev); | 432 | device_add(&dev->gadget.dev); |
433 | retval = driver->bind(&dev->gadget); | 433 | retval = driver->bind(&dev->gadget); |
434 | if (retval) { | 434 | if (retval) { |
435 | printk("%s: bind to driver %s --> error %d\n", dev->gadget.name, | 435 | printk(KERN_WARNING "%s: bind to driver %s --> error %d\n", |
436 | driver->driver.name, retval); | 436 | dev->gadget.name, driver->driver.name, retval); |
437 | device_del(&dev->gadget.dev); | 437 | device_del(&dev->gadget.dev); |
438 | 438 | ||
439 | dev->driver = 0; | 439 | dev->driver = 0; |
@@ -445,8 +445,8 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver) | |||
445 | * for set_configuration as well as eventual disconnect. | 445 | * for set_configuration as well as eventual disconnect. |
446 | * NOTE: this shouldn't power up until later. | 446 | * NOTE: this shouldn't power up until later. |
447 | */ | 447 | */ |
448 | printk("%s: registered gadget driver '%s'\n", dev->gadget.name, | 448 | printk(KERN_WARNING "%s: registered gadget driver '%s'\n", |
449 | driver->driver.name); | 449 | dev->gadget.name, driver->driver.name); |
450 | 450 | ||
451 | udc_enable(dev); | 451 | udc_enable(dev); |
452 | 452 | ||
@@ -581,7 +581,8 @@ static int read_fifo(struct lh7a40x_ep *ep, struct lh7a40x_request *req) | |||
581 | * discard the extra data. | 581 | * discard the extra data. |
582 | */ | 582 | */ |
583 | if (req->req.status != -EOVERFLOW) | 583 | if (req->req.status != -EOVERFLOW) |
584 | printk("%s overflow %d\n", ep->ep.name, count); | 584 | printk(KERN_WARNING "%s overflow %d\n", |
585 | ep->ep.name, count); | ||
585 | req->req.status = -EOVERFLOW; | 586 | req->req.status = -EOVERFLOW; |
586 | } else { | 587 | } else { |
587 | *buf++ = byte; | 588 | *buf++ = byte; |
@@ -831,7 +832,8 @@ static void lh7a40x_out_epn(struct lh7a40x_udc *dev, u32 ep_idx, u32 intr) | |||
831 | queue); | 832 | queue); |
832 | 833 | ||
833 | if (!req) { | 834 | if (!req) { |
834 | printk("%s: NULL REQ %d\n", | 835 | printk(KERN_WARNING |
836 | "%s: NULL REQ %d\n", | ||
835 | __func__, ep_idx); | 837 | __func__, ep_idx); |
836 | flush(ep); | 838 | flush(ep); |
837 | break; | 839 | break; |
@@ -844,7 +846,7 @@ static void lh7a40x_out_epn(struct lh7a40x_udc *dev, u32 ep_idx, u32 intr) | |||
844 | 846 | ||
845 | } else { | 847 | } else { |
846 | /* Throw packet away.. */ | 848 | /* Throw packet away.. */ |
847 | printk("%s: No descriptor?!?\n", __func__); | 849 | printk(KERN_WARNING "%s: No descriptor?!?\n", __func__); |
848 | flush(ep); | 850 | flush(ep); |
849 | } | 851 | } |
850 | } | 852 | } |