| Message ID | 1346960563-18689-2-git-send-email-robherring2@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Sep 7, 2012 at 3:42 AM, Rob Herring <robherring2@gmail.com> wrote: > From: Rob Herring <rob.herring@calxeda.com> > > IRQ_USB was implicitly included by gpio.h. Use the existing variable > instead of IRQ_USB. > > Signed-off-by: Rob Herring <rob.herring@calxeda.com> > Cc: Eric Miao <eric.y.miao@gmail.com> > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Acked-by: Eric Miao <eric.y.miao@gmail.com> Greg, guess this can go through the ARM tree. > --- > drivers/usb/gadget/pxa27x_udc.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c > index 644b430..7a8713c 100644 > --- a/drivers/usb/gadget/pxa27x_udc.c > +++ b/drivers/usb/gadget/pxa27x_udc.c > @@ -2508,7 +2508,7 @@ static int __init pxa_udc_probe(struct platform_device *pdev) > IRQF_SHARED, driver_name, udc); > if (retval != 0) { > dev_err(udc->dev, "%s: can't get irq %i, err %d\n", > - driver_name, IRQ_USB, retval); > + driver_name, udc->irq, retval); > goto err_irq; > } > retval = usb_add_gadget_udc(&pdev->dev, &udc->gadget); > -- > 1.7.9.5 >
On Fri, Sep 07, 2012 at 11:56:46AM +0800, Eric Miao wrote: > On Fri, Sep 7, 2012 at 3:42 AM, Rob Herring <robherring2@gmail.com> wrote: > > From: Rob Herring <rob.herring@calxeda.com> > > > > IRQ_USB was implicitly included by gpio.h. Use the existing variable > > instead of IRQ_USB. > > > > Signed-off-by: Rob Herring <rob.herring@calxeda.com> > > Cc: Eric Miao <eric.y.miao@gmail.com> > > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > > Acked-by: Eric Miao <eric.y.miao@gmail.com> > > Greg, guess this can go through the ARM tree. That's fine, but note, I'm not the drivers/usb/gadget maintainer, Felipe needs to know about this as well. Rob, the tool, scripts/get_maintainer.pl is your friend, please use it :) greg k-h
diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c index 644b430..7a8713c 100644 --- a/drivers/usb/gadget/pxa27x_udc.c +++ b/drivers/usb/gadget/pxa27x_udc.c @@ -2508,7 +2508,7 @@ static int __init pxa_udc_probe(struct platform_device *pdev) IRQF_SHARED, driver_name, udc); if (retval != 0) { dev_err(udc->dev, "%s: can't get irq %i, err %d\n", - driver_name, IRQ_USB, retval); + driver_name, udc->irq, retval); goto err_irq; } retval = usb_add_gadget_udc(&pdev->dev, &udc->gadget);