> -----Original Message----- > From: Matthijs Kooijman [mailto:matthijs@xxxxxxxx] > Sent: Monday, April 15, 2013 7:14 AM > > From: Stephen Warren <swarren@xxxxxxxxxxxxx> > > The top-level hcd interrupt handlers already used irq_return_t, but the > functions to which it delegates the actual work and the common irq > handler returned plain ints. In addition, they used the IRQ_RETVAL in > the wrong way (but because of the values of the various constants, this > didn't result in wrong behaviour). > > Signed-off-by: Stephen Warren <swarren@xxxxxxxxxxxxx> > [matthijs@xxxxxxxx: Split patch from bigger patch and added commit message] > Signed-off-by: Matthijs Kooijman <matthijs@xxxxxxxx> > --- > drivers/staging/dwc2/core_intr.c | 6 +++--- > drivers/staging/dwc2/hcd.c | 3 +-- > drivers/staging/dwc2/hcd.h | 6 +++--- > drivers/staging/dwc2/hcd_intr.c | 6 +++--- > 4 files changed, 10 insertions(+), 11 deletions(-) ... > diff --git a/drivers/staging/dwc2/hcd_intr.c b/drivers/staging/dwc2/hcd_intr.c > index caa31ba..0e6929c 100644 > --- a/drivers/staging/dwc2/hcd_intr.c > +++ b/drivers/staging/dwc2/hcd_intr.c > @@ -2063,10 +2063,10 @@ static void dwc2_hc_intr(struct dwc2_hsotg *hsotg) > } > > /* This function handles interrupts for the HCD */ > -int dwc2_hcd_intr(struct dwc2_hsotg *hsotg) > +irqreturn_t dwc2_hcd_intr(struct dwc2_hsotg *hsotg) > { > u32 gintsts, dbg_gintsts; > - int retval = 0; > + irqreturn_t retval = IRQ_NONE; > > if (dwc2_check_core_status(hsotg) < 0) { > dev_warn(hsotg->dev, "Controller is disconnected"); > @@ -2083,7 +2083,7 @@ int dwc2_hcd_intr(struct dwc2_hsotg *hsotg) > return 0; This should be "return retval;" If you fix that, then: Acked-by: Paul Zimmerman <paulz@xxxxxxxxxxxx> > } > - retval = 1; > + retval = IRQ_HANDLED; > > dbg_gintsts = gintsts; > #ifndef DEBUG_SOF > -- > 1.8.0 -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
