diff options
author | Will Newton <will.newton@imgtec.com> | 2008-08-12 10:39:10 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-10-17 17:41:06 -0400 |
commit | bf7409a23b4589e65624ca6bcefe6229a16ea0ae (patch) | |
tree | f366ea29aa5f1ce0e47da8693d9f093d9fcdaeaa /drivers/usb/gadget/fsl_usb2_udc.c | |
parent | 7483cff8a3ea4c31a677a6ac1a4eb3d78adcb9cc (diff) |
fsl_usb2_udc: Clean up whitespace in errors and warnings.
VDBG always outputs a trailing \n.
Signed-off-by: Will Newton <will.newton@gmail.com>
Acked-by: Li Yang <leoli@freescale.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/gadget/fsl_usb2_udc.c')
-rw-r--r-- | drivers/usb/gadget/fsl_usb2_udc.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/drivers/usb/gadget/fsl_usb2_udc.c b/drivers/usb/gadget/fsl_usb2_udc.c index d242e7eb5a5..38ffb06f31e 100644 --- a/drivers/usb/gadget/fsl_usb2_udc.c +++ b/drivers/usb/gadget/fsl_usb2_udc.c | |||
@@ -193,7 +193,7 @@ static int dr_controller_setup(struct fsl_udc *udc) | |||
193 | timeout = jiffies + FSL_UDC_RESET_TIMEOUT; | 193 | timeout = jiffies + FSL_UDC_RESET_TIMEOUT; |
194 | while (fsl_readl(&dr_regs->usbcmd) & USB_CMD_CTRL_RESET) { | 194 | while (fsl_readl(&dr_regs->usbcmd) & USB_CMD_CTRL_RESET) { |
195 | if (time_after(jiffies, timeout)) { | 195 | if (time_after(jiffies, timeout)) { |
196 | ERR("udc reset timeout! \n"); | 196 | ERR("udc reset timeout!\n"); |
197 | return -ETIMEDOUT; | 197 | return -ETIMEDOUT; |
198 | } | 198 | } |
199 | cpu_relax(); | 199 | cpu_relax(); |
@@ -702,7 +702,7 @@ static struct ep_td_struct *fsl_build_dtd(struct fsl_req *req, unsigned *length, | |||
702 | *is_last = 0; | 702 | *is_last = 0; |
703 | 703 | ||
704 | if ((*is_last) == 0) | 704 | if ((*is_last) == 0) |
705 | VDBG("multi-dtd request!\n"); | 705 | VDBG("multi-dtd request!"); |
706 | /* Fill in the transfer size; set active bit */ | 706 | /* Fill in the transfer size; set active bit */ |
707 | swap_temp = ((*length << DTD_LENGTH_BIT_POS) | DTD_STATUS_ACTIVE); | 707 | swap_temp = ((*length << DTD_LENGTH_BIT_POS) | DTD_STATUS_ACTIVE); |
708 | 708 | ||
@@ -765,11 +765,11 @@ fsl_ep_queue(struct usb_ep *_ep, struct usb_request *_req, gfp_t gfp_flags) | |||
765 | /* catch various bogus parameters */ | 765 | /* catch various bogus parameters */ |
766 | if (!_req || !req->req.complete || !req->req.buf | 766 | if (!_req || !req->req.complete || !req->req.buf |
767 | || !list_empty(&req->queue)) { | 767 | || !list_empty(&req->queue)) { |
768 | VDBG("%s, bad params\n", __func__); | 768 | VDBG("%s, bad params", __func__); |
769 | return -EINVAL; | 769 | return -EINVAL; |
770 | } | 770 | } |
771 | if (unlikely(!_ep || !ep->desc)) { | 771 | if (unlikely(!_ep || !ep->desc)) { |
772 | VDBG("%s, bad ep\n", __func__); | 772 | VDBG("%s, bad ep", __func__); |
773 | return -EINVAL; | 773 | return -EINVAL; |
774 | } | 774 | } |
775 | if (ep->desc->bmAttributes == USB_ENDPOINT_XFER_ISOC) { | 775 | if (ep->desc->bmAttributes == USB_ENDPOINT_XFER_ISOC) { |
@@ -1061,7 +1061,7 @@ static int fsl_vbus_session(struct usb_gadget *gadget, int is_active) | |||
1061 | 1061 | ||
1062 | udc = container_of(gadget, struct fsl_udc, gadget); | 1062 | udc = container_of(gadget, struct fsl_udc, gadget); |
1063 | spin_lock_irqsave(&udc->lock, flags); | 1063 | spin_lock_irqsave(&udc->lock, flags); |
1064 | VDBG("VBUS %s\n", is_active ? "on" : "off"); | 1064 | VDBG("VBUS %s", is_active ? "on" : "off"); |
1065 | udc->vbus_active = (is_active != 0); | 1065 | udc->vbus_active = (is_active != 0); |
1066 | if (can_pullup(udc)) | 1066 | if (can_pullup(udc)) |
1067 | fsl_writel((fsl_readl(&dr_regs->usbcmd) | USB_CMD_RUN_STOP), | 1067 | fsl_writel((fsl_readl(&dr_regs->usbcmd) | USB_CMD_RUN_STOP), |
@@ -1161,7 +1161,7 @@ static int ep0_prime_status(struct fsl_udc *udc, int direction) | |||
1161 | return -ENOMEM; | 1161 | return -ENOMEM; |
1162 | 1162 | ||
1163 | if (status) | 1163 | if (status) |
1164 | ERR("Can't queue ep0 status request \n"); | 1164 | ERR("Can't queue ep0 status request\n"); |
1165 | list_add_tail(&req->queue, &ep->queue); | 1165 | list_add_tail(&req->queue, &ep->queue); |
1166 | 1166 | ||
1167 | return status; | 1167 | return status; |
@@ -1247,7 +1247,7 @@ static void ch9getstatus(struct fsl_udc *udc, u8 request_type, u16 value, | |||
1247 | goto stall; | 1247 | goto stall; |
1248 | 1248 | ||
1249 | if (status) { | 1249 | if (status) { |
1250 | ERR("Can't respond to getstatus request \n"); | 1250 | ERR("Can't respond to getstatus request\n"); |
1251 | goto stall; | 1251 | goto stall; |
1252 | } | 1252 | } |
1253 | list_add_tail(&req->queue, &ep->queue); | 1253 | list_add_tail(&req->queue, &ep->queue); |
@@ -1389,7 +1389,7 @@ static void ep0_req_complete(struct fsl_udc *udc, struct fsl_ep *ep0, | |||
1389 | udc->ep0_state = WAIT_FOR_SETUP; | 1389 | udc->ep0_state = WAIT_FOR_SETUP; |
1390 | break; | 1390 | break; |
1391 | case WAIT_FOR_SETUP: | 1391 | case WAIT_FOR_SETUP: |
1392 | ERR("Unexpect ep0 packets \n"); | 1392 | ERR("Unexpect ep0 packets\n"); |
1393 | break; | 1393 | break; |
1394 | default: | 1394 | default: |
1395 | ep0stall(udc); | 1395 | ep0stall(udc); |
@@ -1468,7 +1468,7 @@ static int process_ep_req(struct fsl_udc *udc, int pipe, | |||
1468 | status = -EILSEQ; | 1468 | status = -EILSEQ; |
1469 | break; | 1469 | break; |
1470 | } else | 1470 | } else |
1471 | ERR("Unknown error has occured (0x%x)!\r\n", | 1471 | ERR("Unknown error has occured (0x%x)!\n", |
1472 | errors); | 1472 | errors); |
1473 | 1473 | ||
1474 | } else if (le32_to_cpu(curr_td->size_ioc_sts) | 1474 | } else if (le32_to_cpu(curr_td->size_ioc_sts) |
@@ -1487,7 +1487,7 @@ static int process_ep_req(struct fsl_udc *udc, int pipe, | |||
1487 | } | 1487 | } |
1488 | } else { | 1488 | } else { |
1489 | td_complete++; | 1489 | td_complete++; |
1490 | VDBG("dTD transmitted successful "); | 1490 | VDBG("dTD transmitted successful"); |
1491 | } | 1491 | } |
1492 | 1492 | ||
1493 | if (j != curr_req->dtd_count - 1) | 1493 | if (j != curr_req->dtd_count - 1) |
@@ -1755,7 +1755,7 @@ static irqreturn_t fsl_udc_irq(int irq, void *_udc) | |||
1755 | } | 1755 | } |
1756 | 1756 | ||
1757 | if (irq_src & (USB_STS_ERR | USB_STS_SYS_ERR)) { | 1757 | if (irq_src & (USB_STS_ERR | USB_STS_SYS_ERR)) { |
1758 | VDBG("Error IRQ %x ", irq_src); | 1758 | VDBG("Error IRQ %x", irq_src); |
1759 | } | 1759 | } |
1760 | 1760 | ||
1761 | spin_unlock_irqrestore(&udc->lock, flags); | 1761 | spin_unlock_irqrestore(&udc->lock, flags); |
@@ -1806,12 +1806,12 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver) | |||
1806 | udc_controller->usb_state = USB_STATE_ATTACHED; | 1806 | udc_controller->usb_state = USB_STATE_ATTACHED; |
1807 | udc_controller->ep0_state = WAIT_FOR_SETUP; | 1807 | udc_controller->ep0_state = WAIT_FOR_SETUP; |
1808 | udc_controller->ep0_dir = 0; | 1808 | udc_controller->ep0_dir = 0; |
1809 | printk(KERN_INFO "%s: bind to driver %s \n", | 1809 | printk(KERN_INFO "%s: bind to driver %s\n", |
1810 | udc_controller->gadget.name, driver->driver.name); | 1810 | udc_controller->gadget.name, driver->driver.name); |
1811 | 1811 | ||
1812 | out: | 1812 | out: |
1813 | if (retval) | 1813 | if (retval) |
1814 | printk("retval %d \n", retval); | 1814 | printk("gadget driver register failed %d\n", retval); |
1815 | return retval; | 1815 | return retval; |
1816 | } | 1816 | } |
1817 | EXPORT_SYMBOL(usb_gadget_register_driver); | 1817 | EXPORT_SYMBOL(usb_gadget_register_driver); |
@@ -1853,7 +1853,7 @@ int usb_gadget_unregister_driver(struct usb_gadget_driver *driver) | |||
1853 | udc_controller->gadget.dev.driver = NULL; | 1853 | udc_controller->gadget.dev.driver = NULL; |
1854 | udc_controller->driver = NULL; | 1854 | udc_controller->driver = NULL; |
1855 | 1855 | ||
1856 | printk("unregistered gadget driver '%s'\r\n", driver->driver.name); | 1856 | printk("unregistered gadget driver '%s'\n", driver->driver.name); |
1857 | return 0; | 1857 | return 0; |
1858 | } | 1858 | } |
1859 | EXPORT_SYMBOL(usb_gadget_unregister_driver); | 1859 | EXPORT_SYMBOL(usb_gadget_unregister_driver); |
@@ -2241,7 +2241,7 @@ static int __init fsl_udc_probe(struct platform_device *pdev) | |||
2241 | u32 dccparams; | 2241 | u32 dccparams; |
2242 | 2242 | ||
2243 | if (strcmp(pdev->name, driver_name)) { | 2243 | if (strcmp(pdev->name, driver_name)) { |
2244 | VDBG("Wrong device\n"); | 2244 | VDBG("Wrong device"); |
2245 | return -ENODEV; | 2245 | return -ENODEV; |
2246 | } | 2246 | } |
2247 | 2247 | ||
@@ -2259,7 +2259,7 @@ static int __init fsl_udc_probe(struct platform_device *pdev) | |||
2259 | 2259 | ||
2260 | if (!request_mem_region(res->start, res->end - res->start + 1, | 2260 | if (!request_mem_region(res->start, res->end - res->start + 1, |
2261 | driver_name)) { | 2261 | driver_name)) { |
2262 | ERR("request mem region for %s failed \n", pdev->name); | 2262 | ERR("request mem region for %s failed\n", pdev->name); |
2263 | kfree(udc_controller); | 2263 | kfree(udc_controller); |
2264 | return -EBUSY; | 2264 | return -EBUSY; |
2265 | } | 2265 | } |
@@ -2293,7 +2293,7 @@ static int __init fsl_udc_probe(struct platform_device *pdev) | |||
2293 | ret = request_irq(udc_controller->irq, fsl_udc_irq, IRQF_SHARED, | 2293 | ret = request_irq(udc_controller->irq, fsl_udc_irq, IRQF_SHARED, |
2294 | driver_name, udc_controller); | 2294 | driver_name, udc_controller); |
2295 | if (ret != 0) { | 2295 | if (ret != 0) { |
2296 | ERR("cannot request irq %d err %d \n", | 2296 | ERR("cannot request irq %d err %d\n", |
2297 | udc_controller->irq, ret); | 2297 | udc_controller->irq, ret); |
2298 | goto err2; | 2298 | goto err2; |
2299 | } | 2299 | } |
@@ -2456,7 +2456,7 @@ module_init(udc_init); | |||
2456 | static void __exit udc_exit(void) | 2456 | static void __exit udc_exit(void) |
2457 | { | 2457 | { |
2458 | platform_driver_unregister(&udc_driver); | 2458 | platform_driver_unregister(&udc_driver); |
2459 | printk("%s unregistered \n", driver_desc); | 2459 | printk("%s unregistered\n", driver_desc); |
2460 | } | 2460 | } |
2461 | 2461 | ||
2462 | module_exit(udc_exit); | 2462 | module_exit(udc_exit); |