usb: gadget: udc: pxa27x: fix build warning when !OF

Commit Message

Robert Jarzmik Nov. 6, 2014, 7:55 p.m. UTC

Daniel Mack <[e-mail]> 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]) ?

Cheers.

--
Robert

[1] Patch
From: Robert Jarzmik <[e-mail]>
Subject: [PATCH v1] usb: gadget: pxa27x_udc: fix warning in non device-tree build
To: Felipe Balbi <[e-mail]>
Cc: [e-mail], Robert Jarzmik <[e-mail]>
Date: Wed, 29 Oct 2014 21:58:33 +0100 (1 week, 22 hours, 56 minutes ago)
Message-Id: <[e-mail]>
X-Mailer: git-send-email 2.1.0

The recent change bringing device-tree support triggers a warning in a
non device-tree build :
  drivers/usb/gadget/udc/pxa27x_udc.c:2405:28: warning: 'udc_pxa_dt_ids'
  defined but not used [-Wunused-variable]

Fix the warning with a preprocessor condition.

Signed-off-by: Robert Jarzmik <[e-mail]>
---
 drivers/usb/gadget/udc/pxa27x_udc.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Felipe Balbi Nov. 6, 2014, 10:17 p.m. UTC | #1

Hi,

On Thu, Nov 06, 2014 at 08:55:35PM +0100, Robert Jarzmik wrote:
> Daniel Mack <[e-mail]> 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.

Felipe Balbi Nov. 6, 2014, 10:25 p.m. UTC | #2

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 <[e-mail]> 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.

Robert Jarzmik Nov. 7, 2014, 7:26 a.m. UTC | #3

Felipe Balbi <[e-mail]> 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.

Patch

diff --git a/drivers/usb/gadget/udc/pxa27x_udc.c b/drivers/usb/gadget/udc/pxa27x_udc.c
index 69e7b816..9b03fab 100644
--- a/drivers/usb/gadget/udc/pxa27x_udc.c
+++ b/drivers/usb/gadget/udc/pxa27x_udc.c
@@ -2400,11 +2400,13 @@  static struct pxa_udc memory = {
 	}
 };
 
+#if defined(CONFIG_OF)
 static struct of_device_id udc_pxa_dt_ids[] = {
 	{ .compatible = "marvell,pxa270-udc" },
 	{}
 };
 MODULE_DEVICE_TABLE(of, udc_pxa_dt_ids);
+#endif
 
 /**
  * pxa_udc_probe - probes the udc device