diff options
Diffstat (limited to 'drivers/usb/gadget/pxa2xx_udc.c')
-rw-r--r-- | drivers/usb/gadget/pxa2xx_udc.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/usb/gadget/pxa2xx_udc.c b/drivers/usb/gadget/pxa2xx_udc.c index f1adcf8b2023..f42c00ef0bca 100644 --- a/drivers/usb/gadget/pxa2xx_udc.c +++ b/drivers/usb/gadget/pxa2xx_udc.c | |||
@@ -110,7 +110,7 @@ static int use_dma = 1; | |||
110 | module_param(use_dma, bool, 0); | 110 | module_param(use_dma, bool, 0); |
111 | MODULE_PARM_DESC (use_dma, "true to use dma"); | 111 | MODULE_PARM_DESC (use_dma, "true to use dma"); |
112 | 112 | ||
113 | static void dma_nodesc_handler (int dmach, void *_ep, struct pt_regs *r); | 113 | static void dma_nodesc_handler (int dmach, void *_ep); |
114 | static void kick_dma(struct pxa2xx_ep *ep, struct pxa2xx_request *req); | 114 | static void kick_dma(struct pxa2xx_ep *ep, struct pxa2xx_request *req); |
115 | 115 | ||
116 | #ifdef USE_OUT_DMA | 116 | #ifdef USE_OUT_DMA |
@@ -828,7 +828,7 @@ static void cancel_dma(struct pxa2xx_ep *ep) | |||
828 | } | 828 | } |
829 | 829 | ||
830 | /* dma channel stopped ... normal tx end (IN), or on error (IN/OUT) */ | 830 | /* dma channel stopped ... normal tx end (IN), or on error (IN/OUT) */ |
831 | static void dma_nodesc_handler(int dmach, void *_ep, struct pt_regs *r) | 831 | static void dma_nodesc_handler(int dmach, void *_ep) |
832 | { | 832 | { |
833 | struct pxa2xx_ep *ep = _ep; | 833 | struct pxa2xx_ep *ep = _ep; |
834 | struct pxa2xx_request *req; | 834 | struct pxa2xx_request *req; |
@@ -1724,7 +1724,7 @@ EXPORT_SYMBOL(usb_gadget_unregister_driver); | |||
1724 | */ | 1724 | */ |
1725 | 1725 | ||
1726 | static irqreturn_t | 1726 | static irqreturn_t |
1727 | lubbock_vbus_irq(int irq, void *_dev, struct pt_regs *r) | 1727 | lubbock_vbus_irq(int irq, void *_dev) |
1728 | { | 1728 | { |
1729 | struct pxa2xx_udc *dev = _dev; | 1729 | struct pxa2xx_udc *dev = _dev; |
1730 | int vbus; | 1730 | int vbus; |
@@ -1754,8 +1754,7 @@ lubbock_vbus_irq(int irq, void *_dev, struct pt_regs *r) | |||
1754 | 1754 | ||
1755 | #endif | 1755 | #endif |
1756 | 1756 | ||
1757 | static irqreturn_t | 1757 | static irqreturn_t udc_vbus_irq(int irq, void *_dev) |
1758 | udc_vbus_irq(int irq, void *_dev, struct pt_regs *r) | ||
1759 | { | 1758 | { |
1760 | struct pxa2xx_udc *dev = _dev; | 1759 | struct pxa2xx_udc *dev = _dev; |
1761 | int vbus = pxa_gpio_get(dev->mach->gpio_vbus); | 1760 | int vbus = pxa_gpio_get(dev->mach->gpio_vbus); |
@@ -2084,7 +2083,7 @@ static void handle_ep(struct pxa2xx_ep *ep) | |||
2084 | * could cause usb protocol errors. | 2083 | * could cause usb protocol errors. |
2085 | */ | 2084 | */ |
2086 | static irqreturn_t | 2085 | static irqreturn_t |
2087 | pxa2xx_udc_irq(int irq, void *_dev, struct pt_regs *r) | 2086 | pxa2xx_udc_irq(int irq, void *_dev) |
2088 | { | 2087 | { |
2089 | struct pxa2xx_udc *dev = _dev; | 2088 | struct pxa2xx_udc *dev = _dev; |
2090 | int handled; | 2089 | int handled; |