| Message ID | 1386427686-30190-1-git-send-email-ezequiel.garcia@free-electrons.com |
|---|---|
| State | Superseded |
| Headers | show |
Hello. > Since the of_mtd header provides dummy stubs for !CONFIG_OF, it's safe > to remove the #ifdef CONFIG_OF. Build tested only. > > Cc: Alexander Shiyan <shc_work@mail.ru> > Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> ... > -#ifdef CONFIG_OF > static const struct of_device_id gpio_nand_id_table[] = { You should add "__maybe_unused" attribute here in this case. This will avoid warning when you build driver without OF. ---
On Sat, Dec 07, 2013 at 06:54:32PM +0400, Alexander Shiyan wrote: > Hello. > > > Since the of_mtd header provides dummy stubs for !CONFIG_OF, it's safe > > to remove the #ifdef CONFIG_OF. Build tested only. > > > > Cc: Alexander Shiyan <shc_work@mail.ru> > > Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> > ... > > -#ifdef CONFIG_OF > > static const struct of_device_id gpio_nand_id_table[] = { > > You should add "__maybe_unused" attribute here in this case. > This will avoid warning when you build driver without OF. > > --- I don't get such warning, maybe because the GCC is smart enough to remove the symbol? Actually, I realise now we don't need to of_match_ptr, so let me push a v2.
> On Sat, Dec 07, 2013 at 06:54:32PM +0400, Alexander Shiyan wrote: > > Hello. > > > > > Since the of_mtd header provides dummy stubs for !CONFIG_OF, it's safe > > > to remove the #ifdef CONFIG_OF. Build tested only. > > > > > > Cc: Alexander Shiyan <shc_work@mail.ru> > > > Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> > > ... > > > -#ifdef CONFIG_OF > > > static const struct of_device_id gpio_nand_id_table[] = { > > > > You should add "__maybe_unused" attribute here in this case. > > This will avoid warning when you build driver without OF. > > > > --- > > I don't get such warning, maybe because the GCC is smart enough > to remove the symbol? > > Actually, I realise now we don't need to of_match_ptr, so let > me push a v2. And without of_match_ptr() we do not need to define "__maybe_unused" for this :) ---
On Sat, Dec 07, 2013 at 07:35:49PM +0400, Alexander Shiyan wrote: > > On Sat, Dec 07, 2013 at 06:54:32PM +0400, Alexander Shiyan wrote: > > > Hello. > > > > > > > Since the of_mtd header provides dummy stubs for !CONFIG_OF, it's safe > > > > to remove the #ifdef CONFIG_OF. Build tested only. > > > > > > > > Cc: Alexander Shiyan <shc_work@mail.ru> > > > > Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> > > > ... > > > > -#ifdef CONFIG_OF > > > > static const struct of_device_id gpio_nand_id_table[] = { > > > > > > You should add "__maybe_unused" attribute here in this case. > > > This will avoid warning when you build driver without OF. > > > > > > --- > > > > I don't get such warning, maybe because the GCC is smart enough > > to remove the symbol? > > > > Actually, I realise now we don't need to of_match_ptr, so let > > me push a v2. > > And without of_match_ptr() we do not need to define "__maybe_unused" for this :) > Yup :-) Care to give the v2 a test? I've just submitted it. Thanks!
> > > > > Since the of_mtd header provides dummy stubs for !CONFIG_OF, it's safe > > > > > to remove the #ifdef CONFIG_OF. Build tested only. ... > > > Actually, I realise now we don't need to of_match_ptr, so let > > > me push a v2. > > > > And without of_match_ptr() we do not need to define "__maybe_unused" for this :) > > > Yup :-) > > Care to give the v2 a test? I've just submitted it. I see. Looks good, compile test is enough for such changes. ---
diff --git a/drivers/mtd/nand/gpio.c b/drivers/mtd/nand/gpio.c index e826f89..8010975 100644 --- a/drivers/mtd/nand/gpio.c +++ b/drivers/mtd/nand/gpio.c @@ -94,7 +94,6 @@ static int gpio_nand_devready(struct mtd_info *mtd) return gpio_get_value(gpiomtd->plat.gpio_rdy); } -#ifdef CONFIG_OF static const struct of_device_id gpio_nand_id_table[] = { { .compatible = "gpio-control-nand" }, {} @@ -145,19 +144,6 @@ static struct resource *gpio_nand_get_io_sync_of(struct platform_device *pdev) return r; } -#else /* CONFIG_OF */ -static inline int gpio_nand_get_config_of(const struct device *dev, - struct gpio_nand_platdata *plat) -{ - return -ENOSYS; -} - -static inline struct resource * -gpio_nand_get_io_sync_of(struct platform_device *pdev) -{ - return NULL; -} -#endif /* CONFIG_OF */ static inline int gpio_nand_get_config(const struct device *dev, struct gpio_nand_platdata *plat)
Since the of_mtd header provides dummy stubs for !CONFIG_OF, it's safe to remove the #ifdef CONFIG_OF. Build tested only. Cc: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> --- drivers/mtd/nand/gpio.c | 14 -------------- 1 file changed, 14 deletions(-)