Message ID | 1413998606-9589-1-git-send-email-computersforpeace@gmail.com |
---|---|
State | Accepted |
Commit | d4efafcc040dcc91b09fd393756e4ee4ad7bf9f2 |
Headers | show |
On Wed, Oct 22, 2014 at 10:23 AM, Brian Norris <computersforpeace@gmail.com> wrote: > drivers/mtd/devices/docg3.c:2122:28: warning: 'docg3_dt_ids' defined but not used [-Wunused-variable] > static struct of_device_id docg3_dt_ids[] = { I suppose I should add that this only happens when CONFIG_OF=n. I'll add this to the commit message if/when I apply this. Brian > Signed-off-by: Brian Norris <computersforpeace@gmail.com> > Cc: Robert Jarzmik <robert.jarzmik@free.fr> > --- > drivers/mtd/devices/docg3.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/mtd/devices/docg3.c b/drivers/mtd/devices/docg3.c > index abd94668a05d..0d9d3ee68b61 100644 > --- a/drivers/mtd/devices/docg3.c > +++ b/drivers/mtd/devices/docg3.c > @@ -2119,11 +2119,13 @@ static int __exit docg3_release(struct platform_device *pdev) > return 0; > } > > +#ifdef CONFIG_OF > static struct of_device_id docg3_dt_ids[] = { > { .compatible = "m-systems,diskonchip-g3" }, > {} > }; > MODULE_DEVICE_TABLE(of, docg3_dt_ids); > +#endif > > static struct platform_driver g3_driver = { > .driver = {
Brian Norris <computersforpeace@gmail.com> writes: > On Wed, Oct 22, 2014 at 10:23 AM, Brian Norris > <computersforpeace@gmail.com> wrote: >> drivers/mtd/devices/docg3.c:2122:28: warning: 'docg3_dt_ids' defined but not used [-Wunused-variable] >> static struct of_device_id docg3_dt_ids[] = { > > I suppose I should add that this only happens when CONFIG_OF=n. I'll > add this to the commit message if/when I apply this. Thanks Brian, I had forgotten the non device-tree case, and overviewed the warning. Your change is the way to go. Cheers. -- Robert
On Wed, Oct 22, 2014 at 09:38:39PM +0200, Robert Jarzmik wrote: > Brian Norris <computersforpeace@gmail.com> writes: > > > On Wed, Oct 22, 2014 at 10:23 AM, Brian Norris > > <computersforpeace@gmail.com> wrote: > >> drivers/mtd/devices/docg3.c:2122:28: warning: 'docg3_dt_ids' defined but not used [-Wunused-variable] > >> static struct of_device_id docg3_dt_ids[] = { > > > > I suppose I should add that this only happens when CONFIG_OF=n. I'll > > add this to the commit message if/when I apply this. > > Thanks Brian, I had forgotten the non device-tree case, and overviewed the > warning. Your change is the way to go. OK, applied to l2-mtd.git. Brian
diff --git a/drivers/mtd/devices/docg3.c b/drivers/mtd/devices/docg3.c index abd94668a05d..0d9d3ee68b61 100644 --- a/drivers/mtd/devices/docg3.c +++ b/drivers/mtd/devices/docg3.c @@ -2119,11 +2119,13 @@ static int __exit docg3_release(struct platform_device *pdev) return 0; } +#ifdef CONFIG_OF static struct of_device_id docg3_dt_ids[] = { { .compatible = "m-systems,diskonchip-g3" }, {} }; MODULE_DEVICE_TABLE(of, docg3_dt_ids); +#endif static struct platform_driver g3_driver = { .driver = {
drivers/mtd/devices/docg3.c:2122:28: warning: 'docg3_dt_ids' defined but not used [-Wunused-variable] static struct of_device_id docg3_dt_ids[] = { Signed-off-by: Brian Norris <computersforpeace@gmail.com> Cc: Robert Jarzmik <robert.jarzmik@free.fr> --- drivers/mtd/devices/docg3.c | 2 ++ 1 file changed, 2 insertions(+)