]> Pileus Git - ~andy/linux/commitdiff
staging: dwc2: remove dummy interrupt handling
authorMatthijs Kooijman <matthijs@stdin.nl>
Thu, 25 Apr 2013 21:39:16 +0000 (23:39 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 16 May 2013 22:22:39 +0000 (15:22 -0700)
The handling for the IC2INT and RESTOREDONE interrupts just cleared the
interrupt flag, but did not do anything else. Since these interrupts are
not enabled anywhere, they should never trigger and there should never
be a need to clear their flags, so we can safely remove this code.

Signed-off-by: Matthijs Kooijman <matthijs@stdin.nl>
Acked-by: Paul Zimmerman <paulz@synopsys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/dwc2/core_intr.c
drivers/staging/dwc2/hcd_intr.c

index e393a95e83b35c7911c5b064dfd9290c3c524f2a..98c51bba6622ea5762a0b056737b3a142a78bd1b 100644 (file)
@@ -403,8 +403,7 @@ static void dwc2_handle_usb_suspend_intr(struct dwc2_hsotg *hsotg)
 #define GINTMSK_COMMON (GINTSTS_WKUPINT | GINTSTS_SESSREQINT |         \
                         GINTSTS_CONIDSTSCHNG | GINTSTS_OTGINT |        \
                         GINTSTS_MODEMIS | GINTSTS_DISCONNINT |         \
-                        GINTSTS_USBSUSP | GINTSTS_RESTOREDONE |        \
-                        GINTSTS_PRTINT)
+                        GINTSTS_USBSUSP | GINTSTS_PRTINT)
 
 /*
  * This function returns the Core Interrupt register
@@ -478,12 +477,6 @@ irqreturn_t dwc2_handle_common_intr(int irq, void *dev)
        if (gintsts & GINTSTS_USBSUSP)
                dwc2_handle_usb_suspend_intr(hsotg);
 
-       if (gintsts & GINTSTS_RESTOREDONE) {
-               gintsts = GINTSTS_RESTOREDONE;
-               writel(gintsts, hsotg->regs + GINTSTS);
-               dev_dbg(hsotg->dev, " --Restore done interrupt received--\n");
-       }
-
        if (gintsts & GINTSTS_PRTINT) {
                /*
                 * The port interrupt occurs while in device mode with HPRT0
index 7e28c18d30020e11057d597d68bfbbd7358a64b2..9fb926938a18cad47898c65835158e0ca536f123 100644 (file)
@@ -2104,9 +2104,6 @@ irqreturn_t dwc2_handle_hcd_intr(struct dwc2_hsotg *hsotg)
                        dwc2_rx_fifo_level_intr(hsotg);
                if (gintsts & GINTSTS_NPTXFEMP)
                        dwc2_np_tx_fifo_empty_intr(hsotg);
-               if (gintsts & GINTSTS_I2CINT)
-                       /* Todo: Implement i2cintr handler */
-                       writel(GINTSTS_I2CINT, hsotg->regs + GINTSTS);
                if (gintsts & GINTSTS_PRTINT)
                        dwc2_port_intr(hsotg);
                if (gintsts & GINTSTS_HCHINT)