Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1230214

[PATCH v2 07/12] usb: gadget: amd5536udc: remove forward declaration of udc_remote_wakeup

Show all headers | View raw

Rearrange the udc_remote_wakeup function to remove the forward
declaration.

Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
---
 drivers/usb/gadget/udc/amd5536udc.c | 41 ++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/drivers/usb/gadget/udc/amd5536udc.c b/drivers/usb/gadget/udc/amd5536udc.c
index 6c16737..f218520 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);
 static int udc_free_dma_chain(struct udc *dev, struct udc_request *req);
 static int udc_create_dma_chain(struct udc_ep *ep, struct udc_request *req,
 				unsigned long buf_len, gfp_t gfp_flags);
-static int udc_remote_wakeup(struct udc *dev);
 static int udc_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id);
 static void udc_pci_remove(struct pci_dev *pdev);
 
@@ -1452,6 +1451,26 @@ static int udc_get_frame(struct usb_gadget *gadget)
 	return -EOPNOTSUPP;
 }
 
+/* Initiates a remote wakeup */
+static int udc_remote_wakeup(struct udc *dev)
+{
+	unsigned long flags;
+	u32 tmp;
+
+	DBG(dev, "UDC initiates remote wakeup\n");
+
+	spin_lock_irqsave(&dev->lock, flags);
+
+	tmp = readl(&dev->regs->ctl);
+	tmp |= AMD_BIT(UDC_DEVCTL_RES);
+	writel(tmp, &dev->regs->ctl);
+	tmp &= AMD_CLEAR_BIT(UDC_DEVCTL_RES);
+	writel(tmp, &dev->regs->ctl);
+
+	spin_unlock_irqrestore(&dev->lock, flags);
+	return 0;
+}
+
 /* Remote wakeup gadget interface */
 static int udc_wakeup(struct usb_gadget *gadget)
 {
@@ -3384,26 +3403,6 @@ err_pcidev:
 	return retval;
 }
 
-/* Initiates a remote wakeup */
-static int udc_remote_wakeup(struct udc *dev)
-{
-	unsigned long flags;
-	u32 tmp;
-
-	DBG(dev, "UDC initiates remote wakeup\n");
-
-	spin_lock_irqsave(&dev->lock, flags);
-
-	tmp = readl(&dev->regs->ctl);
-	tmp |= AMD_BIT(UDC_DEVCTL_RES);
-	writel(tmp, &dev->regs->ctl);
-	tmp &= AMD_CLEAR_BIT(UDC_DEVCTL_RES);
-	writel(tmp, &dev->regs->ctl);
-
-	spin_unlock_irqrestore(&dev->lock, flags);
-	return 0;
-}
-
 /* PCI device parameters */
 static const struct pci_device_id pci_id[] = {
 	{
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH v2 00/12] usb: gadget: amd5536udc: fix memory leaks Sudip Mukherjee <sudipm.mukherjee@gmail.com> - 2015-09-22 15:30 +0200
  [PATCH v2 08/12] usb: gadget: amd5536udc: remove forward declaration of udc_create_dma_chain Sudip Mukherjee <sudipm.mukherjee@gmail.com> - 2015-09-22 15:30 +0200
  [PATCH v2 03/12] usb: gadget: amd5536udc: use WARN_ON Sudip Mukherjee <sudipm.mukherjee@gmail.com> - 2015-09-22 15:30 +0200
  [PATCH v2 05/12] usb: gadget: amd5536udc: remove unnecessary conditions Sudip Mukherjee <sudipm.mukherjee@gmail.com> - 2015-09-22 15:30 +0200
  [PATCH v2 12/12] usb: gadget: amd5536udc: NULL comparison Sudip Mukherjee <sudipm.mukherjee@gmail.com> - 2015-09-22 15:30 +0200
  [PATCH v2 06/12] usb: gadget: amd5536udc: remove forward declaration of udc_probe Sudip Mukherjee <sudipm.mukherjee@gmail.com> - 2015-09-22 15:30 +0200
  [PATCH v2 09/12] usb: gadget: amd5536udc: remove forward declaration of udc_free_dma_chain Sudip Mukherjee <sudipm.mukherjee@gmail.com> - 2015-09-22 15:30 +0200
  [PATCH v2 04/12] usb: gadget: amd5536udc: use free_dma_pools Sudip Mukherjee <sudipm.mukherjee@gmail.com> - 2015-09-22 15:40 +0200
  [PATCH v2 02/12] usb: gadget: amd5536udc: fix error path Sudip Mukherjee <sudipm.mukherjee@gmail.com> - 2015-09-22 15:40 +0200
    Re: [PATCH v2 02/12] usb: gadget: amd5536udc: fix error path Felipe Balbi <balbi@ti.com> - 2015-09-22 16:40 +0200
      Re: [PATCH v2 02/12] usb: gadget: amd5536udc: fix error path Sudip Mukherjee <sudipm.mukherjee@gmail.com> - 2015-09-22 16:50 +0200
        Re: [PATCH v2 02/12] usb: gadget: amd5536udc: fix error path Sudip Mukherjee <sudipm.mukherjee@gmail.com> - 2015-09-22 17:10 +0200
          Re: [PATCH v2 02/12] usb: gadget: amd5536udc: fix error path Felipe Balbi <balbi@ti.com> - 2015-09-22 17:30 +0200
            Re: [PATCH v2 02/12] usb: gadget: amd5536udc: fix error path Sudip Mukherjee <sudipm.mukherjee@gmail.com> - 2015-09-22 18:40 +0200
            Re: [PATCH v2 02/12] usb: gadget: amd5536udc: fix error path Sudip Mukherjee <sudipm.mukherjee@gmail.com> - 2015-09-30 16:00 +0200
  [PATCH v2 07/12] usb: gadget: amd5536udc: remove forward declaration of udc_remote_wakeup Sudip Mukherjee <sudipm.mukherjee@gmail.com> - 2015-09-22 15:40 +0200

csiph-web