| Message ID | 20200818125338.58148-1-yuehaibing@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | memory: omap-gpmc: Fix build error without CONFIG_OF | expand |
On Tue, Aug 18, 2020 at 08:53:38PM +0800, YueHaibing wrote: > If CONFIG_OF is n, gcc fails: > > drivers/memory/omap-gpmc.o: In function `gpmc_omap_onenand_set_timings': > omap-gpmc.c:(.text+0x2a88): undefined reference to `gpmc_read_settings_dt' > > Add helper function to fix this. > > Fixes: a758f50f10cf ("mtd: onenand: omap2: Configure driver from DT") > Signed-off-by: YueHaibing <yuehaibing@huawei.com> > --- > drivers/memory/omap-gpmc.c | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c > index ce0e7e2d7cff..332bb4580817 100644 > --- a/drivers/memory/omap-gpmc.c > +++ b/drivers/memory/omap-gpmc.c > @@ -1176,6 +1176,7 @@ struct gpmc_nand_ops *gpmc_omap_get_nand_ops(struct gpmc_nand_regs *reg, int cs) > } > EXPORT_SYMBOL_GPL(gpmc_omap_get_nand_ops); > > +#ifdef CONFIG_OF Hi, Instead add empty stub for gpmc_read_settings_dt() in existing #ifdef section - around line 2314. Less ifdefs and actually seems to me appropriate place to group !OF stubs. Best regards, Krzysztof
diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c index ce0e7e2d7cff..332bb4580817 100644 --- a/drivers/memory/omap-gpmc.c +++ b/drivers/memory/omap-gpmc.c @@ -1176,6 +1176,7 @@ struct gpmc_nand_ops *gpmc_omap_get_nand_ops(struct gpmc_nand_regs *reg, int cs) } EXPORT_SYMBOL_GPL(gpmc_omap_get_nand_ops); +#ifdef CONFIG_OF static void gpmc_omap_onenand_calc_sync_timings(struct gpmc_timings *t, struct gpmc_settings *s, int freq, int latency) @@ -1280,6 +1281,14 @@ int gpmc_omap_onenand_set_timings(struct device *dev, int cs, int freq, return gpmc_cs_set_timings(cs, &gpmc_t, &gpmc_s); } +#else +int gpmc_omap_onenand_set_timings(struct device *dev, int cs, int freq, + int latency, + struct gpmc_onenand_info *info) +{ + return -EINVAL; +} +#endif EXPORT_SYMBOL_GPL(gpmc_omap_onenand_set_timings); int gpmc_get_client_irq(unsigned int irq_config)
If CONFIG_OF is n, gcc fails: drivers/memory/omap-gpmc.o: In function `gpmc_omap_onenand_set_timings': omap-gpmc.c:(.text+0x2a88): undefined reference to `gpmc_read_settings_dt' Add helper function to fix this. Fixes: a758f50f10cf ("mtd: onenand: omap2: Configure driver from DT") Signed-off-by: YueHaibing <yuehaibing@huawei.com> --- drivers/memory/omap-gpmc.c | 9 +++++++++ 1 file changed, 9 insertions(+)