diff options
author | Sudip Mukherjee <sudipm.mukherjee@gmail.com> | 2015-09-22 09:24:32 -0400 |
---|---|---|
committer | Felipe Balbi <balbi@ti.com> | 2015-10-01 13:40:21 -0400 |
commit | 79a5b4aa3511f82e1398223062cd62051044288d (patch) | |
tree | a0cae0aaf3012e75055e56ee6bd7adf922d0e691 | |
parent | 4f06b6bb73be3fcdf728d7271ad05cd81df58f3d (diff) |
usb: gadget: amd5536udc: remove forward declaration of udc_remote_wakeup
Rearrange the udc_remote_wakeup function to remove the forward
declaration.
Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
Signed-off-by: Felipe Balbi <balbi@ti.com>
-rw-r--r-- | drivers/usb/gadget/udc/amd5536udc.c | 41 |
1 files changed, 20 insertions, 21 deletions
diff --git a/drivers/usb/gadget/udc/amd5536udc.c b/drivers/usb/gadget/udc/amd5536udc.c index 6c167370cd5a..f218520356ff 100644 --- a/drivers/usb/gadget/udc/amd5536udc.c +++ b/drivers/usb/gadget/udc/amd5536udc.c | |||
@@ -73,7 +73,6 @@ static void udc_free_request(struct usb_ep *usbep, struct usb_request *usbreq); | |||
73 | static int udc_free_dma_chain(struct udc *dev, struct udc_request *req); | 73 | static int udc_free_dma_chain(struct udc *dev, struct udc_request *req); |
74 | static int udc_create_dma_chain(struct udc_ep *ep, struct udc_request *req, | 74 | static int udc_create_dma_chain(struct udc_ep *ep, struct udc_request *req, |
75 | unsigned long buf_len, gfp_t gfp_flags); | 75 | unsigned long buf_len, gfp_t gfp_flags); |
76 | static int udc_remote_wakeup(struct udc *dev); | ||
77 | static int udc_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id); | 76 | static int udc_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id); |
78 | static void udc_pci_remove(struct pci_dev *pdev); | 77 | static void udc_pci_remove(struct pci_dev *pdev); |
79 | 78 | ||
@@ -1452,6 +1451,26 @@ static int udc_get_frame(struct usb_gadget *gadget) | |||
1452 | return -EOPNOTSUPP; | 1451 | return -EOPNOTSUPP; |
1453 | } | 1452 | } |
1454 | 1453 | ||
1454 | /* Initiates a remote wakeup */ | ||
1455 | static int udc_remote_wakeup(struct udc *dev) | ||
1456 | { | ||
1457 | unsigned long flags; | ||
1458 | u32 tmp; | ||
1459 | |||
1460 | DBG(dev, "UDC initiates remote wakeup\n"); | ||
1461 | |||
1462 | spin_lock_irqsave(&dev->lock, flags); | ||
1463 | |||
1464 | tmp = readl(&dev->regs->ctl); | ||
1465 | tmp |= AMD_BIT(UDC_DEVCTL_RES); | ||
1466 | writel(tmp, &dev->regs->ctl); | ||
1467 | tmp &= AMD_CLEAR_BIT(UDC_DEVCTL_RES); | ||
1468 | writel(tmp, &dev->regs->ctl); | ||
1469 | |||
1470 | spin_unlock_irqrestore(&dev->lock, flags); | ||
1471 | return 0; | ||
1472 | } | ||
1473 | |||
1455 | /* Remote wakeup gadget interface */ | 1474 | /* Remote wakeup gadget interface */ |
1456 | static int udc_wakeup(struct usb_gadget *gadget) | 1475 | static int udc_wakeup(struct usb_gadget *gadget) |
1457 | { | 1476 | { |
@@ -3384,26 +3403,6 @@ err_pcidev: | |||
3384 | return retval; | 3403 | return retval; |
3385 | } | 3404 | } |
3386 | 3405 | ||
3387 | /* Initiates a remote wakeup */ | ||
3388 | static int udc_remote_wakeup(struct udc *dev) | ||
3389 | { | ||
3390 | unsigned long flags; | ||
3391 | u32 tmp; | ||
3392 | |||
3393 | DBG(dev, "UDC initiates remote wakeup\n"); | ||
3394 | |||
3395 | spin_lock_irqsave(&dev->lock, flags); | ||
3396 | |||
3397 | tmp = readl(&dev->regs->ctl); | ||
3398 | tmp |= AMD_BIT(UDC_DEVCTL_RES); | ||
3399 | writel(tmp, &dev->regs->ctl); | ||
3400 | tmp &= AMD_CLEAR_BIT(UDC_DEVCTL_RES); | ||
3401 | writel(tmp, &dev->regs->ctl); | ||
3402 | |||
3403 | spin_unlock_irqrestore(&dev->lock, flags); | ||
3404 | return 0; | ||
3405 | } | ||
3406 | |||
3407 | /* PCI device parameters */ | 3406 | /* PCI device parameters */ |
3408 | static const struct pci_device_id pci_id[] = { | 3407 | static const struct pci_device_id pci_id[] = { |
3409 | { | 3408 | { |