| Message ID | 1415249759-6219-1-git-send-email-balbi@ti.com |
|---|---|
| State | New |
| Headers | show |
On 11/06/2014 05:55 AM, Felipe Balbi wrote: > in case kernel is built without CONFIG_OF there > will be a build warning (see below) due to of_match_ptr() > being defined to NULL. > > Because of_match_ptr() is pretty pointless anyway, > let's just remove it and fix the warning. The alternative, of course, would be to wrap the udc_pxa_dt_ids declaration in IS_ENABLED(CONFIG_OF), but I'm not sure whether it's worth it. Daniel > drivers/usb/gadget/udc/pxa27x_udc.c:2403:28: warning: ‘udc_pxa_dt_ids’ defined but not used [-Wunused-variable] > static struct of_device_id udc_pxa_dt_ids[] = { > ^ > Signed-off-by: Felipe Balbi <balbi@ti.com> > --- > drivers/usb/gadget/udc/pxa27x_udc.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/usb/gadget/udc/pxa27x_udc.c b/drivers/usb/gadget/udc/pxa27x_udc.c > index 69e7b816..d1d8a9f 100644 > --- a/drivers/usb/gadget/udc/pxa27x_udc.c > +++ b/drivers/usb/gadget/udc/pxa27x_udc.c > @@ -2590,7 +2590,7 @@ static struct platform_driver udc_driver = { > .driver = { > .name = "pxa27x-udc", > .owner = THIS_MODULE, > - .of_match_table = of_match_ptr(udc_pxa_dt_ids), > + .of_match_table = udc_pxa_dt_ids, > }, > .probe = pxa_udc_probe, > .remove = pxa_udc_remove, > -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi, On Thu, Nov 06, 2014 at 08:55:35PM +0100, Robert Jarzmik wrote: > Daniel Mack <daniel@zonque.org> writes: > > > On 11/06/2014 05:55 AM, Felipe Balbi wrote: > >> in case kernel is built without CONFIG_OF there > >> will be a build warning (see below) due to of_match_ptr() > >> being defined to NULL. > >> > >> Because of_match_ptr() is pretty pointless anyway, > >> let's just remove it and fix the warning. > > > > The alternative, of course, would be to wrap the udc_pxa_dt_ids > > declaration in IS_ENABLED(CONFIG_OF), but I'm not sure whether it's > > worth it. > > Ah, wasn't the patch named "[PATCH v1] usb: gadget: pxa27x_udc: fix > warning in non device-tree build" sent October the 29th fixing this > issue (in [1]) ? I seem to have missed that, let me replace the patches and use yours.
On Thu, Nov 06, 2014 at 04:17:48PM -0600, Felipe Balbi wrote: > Hi, > > On Thu, Nov 06, 2014 at 08:55:35PM +0100, Robert Jarzmik wrote: > > Daniel Mack <daniel@zonque.org> writes: > > > > > On 11/06/2014 05:55 AM, Felipe Balbi wrote: > > >> in case kernel is built without CONFIG_OF there > > >> will be a build warning (see below) due to of_match_ptr() > > >> being defined to NULL. > > >> > > >> Because of_match_ptr() is pretty pointless anyway, > > >> let's just remove it and fix the warning. > > > > > > The alternative, of course, would be to wrap the udc_pxa_dt_ids > > > declaration in IS_ENABLED(CONFIG_OF), but I'm not sure whether it's > > > worth it. > > > > Ah, wasn't the patch named "[PATCH v1] usb: gadget: pxa27x_udc: fix > > warning in non device-tree build" sent October the 29th fixing this > > issue (in [1]) ? > > I seem to have missed that, let me replace the patches and use yours. now done.
Felipe Balbi <balbi@ti.com> writes: > On Thu, Nov 06, 2014 at 04:17:48PM -0600, Felipe Balbi wrote: >> I seem to have missed that, let me replace the patches and use yours. > > now done. Thanks.
diff --git a/drivers/usb/gadget/udc/pxa27x_udc.c b/drivers/usb/gadget/udc/pxa27x_udc.c index 69e7b816..d1d8a9f 100644 --- a/drivers/usb/gadget/udc/pxa27x_udc.c +++ b/drivers/usb/gadget/udc/pxa27x_udc.c @@ -2590,7 +2590,7 @@ static struct platform_driver udc_driver = { .driver = { .name = "pxa27x-udc", .owner = THIS_MODULE, - .of_match_table = of_match_ptr(udc_pxa_dt_ids), + .of_match_table = udc_pxa_dt_ids, }, .probe = pxa_udc_probe, .remove = pxa_udc_remove,
in case kernel is built without CONFIG_OF there will be a build warning (see below) due to of_match_ptr() being defined to NULL. Because of_match_ptr() is pretty pointless anyway, let's just remove it and fix the warning. drivers/usb/gadget/udc/pxa27x_udc.c:2403:28: warning: ‘udc_pxa_dt_ids’ defined but not used [-Wunused-variable] static struct of_device_id udc_pxa_dt_ids[] = { ^ Signed-off-by: Felipe Balbi <balbi@ti.com> --- drivers/usb/gadget/udc/pxa27x_udc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)