aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/dwc2/pci.c
diff options
context:
space:
mode:
authorDinh Nguyen <dinguyen@opensource.altera.com>2014-11-11 12:13:37 -0500
committerFelipe Balbi <balbi@ti.com>2014-11-14 15:59:48 -0500
commitdb8178c33dbe9aba5e2c5d323625f9e6da55d7e6 (patch)
treeb946656ed7c79139b44289ddc876f62d6f47d254 /drivers/usb/dwc2/pci.c
parent510ffaa48eac2587a4df9ec7668e3274e5f96ee3 (diff)
usb: dwc2: Update common interrupt handler to call gadget interrupt handler
Make dwc2_handle_common_intr call the gadget interrupt function when operating in peripheral mode. Remove the spinlock functions in s3c_hsotg_irq as dwc2_handle_common_intr() already has the spinlocks. Move the registeration of the IRQ to common code for platform and PCI. Remove duplicate interrupt conditions that was in gadget, as those are handled by dwc2 common interrupt handler. Acked-by: Paul Zimmerman <paulz@synopsys.com> Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com> Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/dwc2/pci.c')
-rw-r--r--drivers/usb/dwc2/pci.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/usb/dwc2/pci.c b/drivers/usb/dwc2/pci.c
index 6d33ecf2e295..a4e724b0a62e 100644
--- a/drivers/usb/dwc2/pci.c
+++ b/drivers/usb/dwc2/pci.c
@@ -141,6 +141,12 @@ static int dwc2_driver_probe(struct pci_dev *dev,
141 141
142 pci_set_master(dev); 142 pci_set_master(dev);
143 143
144 retval = devm_request_irq(hsotg->dev, dev->irq,
145 dwc2_handle_common_intr, IRQF_SHARED,
146 dev_name(hsotg->dev), hsotg);
147 if (retval)
148 return retval;
149
144 spin_lock_init(&hsotg->lock); 150 spin_lock_init(&hsotg->lock);
145 retval = dwc2_hcd_init(hsotg, dev->irq, &dwc2_module_params); 151 retval = dwc2_hcd_init(hsotg, dev->irq, &dwc2_module_params);
146 if (retval) { 152 if (retval) {