| Message ID | 20200827125316.20780-1-yuehaibing@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v3] memory: omap-gpmc: Fix build error without CONFIG_OF | expand |
On Thu, Aug 27, 2020 at 08:53:16PM +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 gpmc_read_settings_dt() helper function, which zero the gpmc_settings > so the caller doesn't proceed with random/invalid settings. > > Fixes: a758f50f10cf ("mtd: onenand: omap2: Configure driver from DT") > Signed-off-by: YueHaibing <yuehaibing@huawei.com> > --- > v3: zero gpmc_settings > v2: add gpmc_read_settings_dt() stub > --- > drivers/memory/omap-gpmc.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c > index cd9e80748591..e026b4cd3612 100644 > --- a/drivers/memory/omap-gpmc.c > +++ b/drivers/memory/omap-gpmc.c > @@ -2310,6 +2310,10 @@ static void gpmc_probe_dt_children(struct platform_device *pdev) > } > } > #else > +void gpmc_read_settings_dt(struct device_node *np, struct gpmc_settings *p) > +{ > + memset(p, 0, sizeof(struct gpmc_settings)); sizeof(*p) but if patch is otherwise ok (got review/ack) then I can fix it while applying. If there is resend, please fix it as well. Best regards, Krzysztof
On 27/08/2020 16:21, Krzysztof Kozlowski wrote: > On Thu, Aug 27, 2020 at 08:53:16PM +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 gpmc_read_settings_dt() helper function, which zero the gpmc_settings >> so the caller doesn't proceed with random/invalid settings. >> >> Fixes: a758f50f10cf ("mtd: onenand: omap2: Configure driver from DT") >> Signed-off-by: YueHaibing <yuehaibing@huawei.com> >> --- >> v3: zero gpmc_settings >> v2: add gpmc_read_settings_dt() stub >> --- >> drivers/memory/omap-gpmc.c | 4 ++++ >> 1 file changed, 4 insertions(+) >> >> diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c >> index cd9e80748591..e026b4cd3612 100644 >> --- a/drivers/memory/omap-gpmc.c >> +++ b/drivers/memory/omap-gpmc.c >> @@ -2310,6 +2310,10 @@ static void gpmc_probe_dt_children(struct platform_device *pdev) >> } >> } >> #else >> +void gpmc_read_settings_dt(struct device_node *np, struct gpmc_settings *p) >> +{ >> + memset(p, 0, sizeof(struct gpmc_settings)); > > sizeof(*p) but if patch is otherwise ok (got review/ack) then I can fix > it while applying. > > If there is resend, please fix it as well. With the sizeof(*p) change. Acked-by: Roger Quadros <rogerq@ti.com> cheers, -roger
On Thu, Aug 27, 2020 at 07:37:18PM +0300, Roger Quadros wrote: > > > On 27/08/2020 16:21, Krzysztof Kozlowski wrote: > > On Thu, Aug 27, 2020 at 08:53:16PM +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 gpmc_read_settings_dt() helper function, which zero the gpmc_settings > > > so the caller doesn't proceed with random/invalid settings. > > > > > > Fixes: a758f50f10cf ("mtd: onenand: omap2: Configure driver from DT") > > > Signed-off-by: YueHaibing <yuehaibing@huawei.com> > > > --- > > > v3: zero gpmc_settings > > > v2: add gpmc_read_settings_dt() stub > > > --- > > > drivers/memory/omap-gpmc.c | 4 ++++ > > > 1 file changed, 4 insertions(+) > > > > > > diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c > > > index cd9e80748591..e026b4cd3612 100644 > > > --- a/drivers/memory/omap-gpmc.c > > > +++ b/drivers/memory/omap-gpmc.c > > > @@ -2310,6 +2310,10 @@ static void gpmc_probe_dt_children(struct platform_device *pdev) > > > } > > > } > > > #else > > > +void gpmc_read_settings_dt(struct device_node *np, struct gpmc_settings *p) > > > +{ > > > + memset(p, 0, sizeof(struct gpmc_settings)); > > > > sizeof(*p) but if patch is otherwise ok (got review/ack) then I can fix > > it while applying. > > > > If there is resend, please fix it as well. > > With the sizeof(*p) change. > > Acked-by: Roger Quadros <rogerq@ti.com> Thanks, applied. Best regards, Krzysztof
diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c index cd9e80748591..e026b4cd3612 100644 --- a/drivers/memory/omap-gpmc.c +++ b/drivers/memory/omap-gpmc.c @@ -2310,6 +2310,10 @@ static void gpmc_probe_dt_children(struct platform_device *pdev) } } #else +void gpmc_read_settings_dt(struct device_node *np, struct gpmc_settings *p) +{ + memset(p, 0, sizeof(struct gpmc_settings)); +} static int gpmc_probe_dt(struct platform_device *pdev) { return 0;
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 gpmc_read_settings_dt() helper function, which zero the gpmc_settings so the caller doesn't proceed with random/invalid settings. Fixes: a758f50f10cf ("mtd: onenand: omap2: Configure driver from DT") Signed-off-by: YueHaibing <yuehaibing@huawei.com> --- v3: zero gpmc_settings v2: add gpmc_read_settings_dt() stub --- drivers/memory/omap-gpmc.c | 4 ++++ 1 file changed, 4 insertions(+)