| Message ID | 1479314367-9169-2-git-send-email-sudeep.holla@arm.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
On Wednesday, November 16, 2016 4:39:27 PM CET Sudeep Holla wrote: > @@ -223,6 +222,7 @@ static struct platform_driver fsl_guts_driver = { > > static int __init fsl_guts_init(void) > { > + machine = of_flat_dt_get_machine_name(); > return platform_driver_register(&fsl_guts_driver); > } > core_initcall(fsl_guts_init); I think we simply need to use the normal DT API rather than the of_flat_* one. Arnd
On 16/11/16 17:07, Arnd Bergmann wrote: > On Wednesday, November 16, 2016 4:39:27 PM CET Sudeep Holla wrote: >> @@ -223,6 +222,7 @@ static struct platform_driver fsl_guts_driver = { >> >> static int __init fsl_guts_init(void) >> { >> + machine = of_flat_dt_get_machine_name(); >> return platform_driver_register(&fsl_guts_driver); >> } >> core_initcall(fsl_guts_init); > > I think we simply need to use the normal DT API rather than the of_flat_* one. > I thought so, yes that will be better. I will respin accordingly.
diff --git a/drivers/soc/fsl/guts.c b/drivers/soc/fsl/guts.c index 885409d84eb2..5513a2b3448f 100644 --- a/drivers/soc/fsl/guts.c +++ b/drivers/soc/fsl/guts.c @@ -31,6 +31,7 @@ struct fsl_soc_die_attr { static struct guts *guts; static struct soc_device_attribute soc_dev_attr; static struct soc_device *soc_dev; +static const char *machine; /* SoC die attribute definition for QorIQ platform */ @@ -135,7 +136,6 @@ static int fsl_guts_probe(struct platform_device *pdev) struct device *dev = &pdev->dev; struct resource *res; const struct fsl_soc_die_attr *soc_die; - const char *machine; u32 svr; /* Initialize guts */ @@ -151,7 +151,6 @@ static int fsl_guts_probe(struct platform_device *pdev) return PTR_ERR(guts->regs); /* Register soc device */ - machine = of_flat_dt_get_machine_name(); if (machine) soc_dev_attr.machine = devm_kstrdup(dev, machine, GFP_KERNEL); @@ -223,6 +222,7 @@ static struct platform_driver fsl_guts_driver = { static int __init fsl_guts_init(void) { + machine = of_flat_dt_get_machine_name(); return platform_driver_register(&fsl_guts_driver); } core_initcall(fsl_guts_init);
We get the following warning with the driver is compiled in: WARNING: modpost: Found 1 section mismatch(es). To see full details build your kernel with: 'make CONFIG_DEBUG_SECTION_MISMATCH=y' With CONFIG_DEBUG_SECTION_MISMATCH enabled, the details are reported: WARNING: vmlinux.o(.text+0x55d014): Section mismatch in reference from the function fsl_guts_probe() to the function .init.text:of_flat_dt_get_machine_name() The function fsl_guts_probe() references the function __init of_flat_dt_get_machine_name(). This is often because fsl_guts_probe lacks a __init annotation or the annotation of of_flat_dt_get_machine_name is wrong. This patch stashes the machine name during fsl_guts_init initcall to fix the above warnings. Cc: Scott Wood <oss@buserror.net> Cc: Yangbo Lu <yangbo.lu@nxp.com> Cc: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com> --- drivers/soc/fsl/guts.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)