| Message ID | 1479899187-10199-2-git-send-email-bgolaszewski@baylibre.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Bartosz, On Wednesday 23 November 2016 04:36 PM, Bartosz Golaszewski wrote: > In order to avoid a section mismatch use a locally implemented routine > instead of of_flat_dt_get_machine_name() when printing the error > message. > > Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> > --- > drivers/bus/da8xx-mstpri.c | 23 +++++++++++++++++++++-- > 1 file changed, 21 insertions(+), 2 deletions(-) > > diff --git a/drivers/bus/da8xx-mstpri.c b/drivers/bus/da8xx-mstpri.c > index 85f0b53..064eeb9 100644 > --- a/drivers/bus/da8xx-mstpri.c > +++ b/drivers/bus/da8xx-mstpri.c > @@ -16,7 +16,6 @@ > #include <linux/platform_device.h> > #include <linux/io.h> > #include <linux/regmap.h> > -#include <linux/of_fdt.h> > > /* > * REVISIT: Linux doesn't have a good framework for the kind of performance > @@ -190,6 +189,26 @@ static const struct da8xx_mstpri_board_priorities da8xx_mstpri_board_confs[] = { > }, > }; > > +/* > + * FIXME Remove this function once of/base gets a general routine for getting > + * the machine model/compatible string. > + */ > +static const char *da8xx_mstpri_machine_get_compatible(void) > +{ > + struct device_node *root; > + const char *compatible; > + int ret = -1; > + > + root = of_find_node_by_path("/"); > + if (root) { > + ret = of_property_read_string_index(root, "compatible", > + 0, &compatible); > + of_node_put(root); > + } > + > + return ret ? NULL : compatible; > +} As I just noted in the thread for v1 of this patch, calling of_node_put(root) while keeping a reference to its compatible property for later use sounds really broken. I think it is safest to fix this by not including the compatible name in error message at all. The error message will be little less descriptive, but thats better than adding questionable code. Thats what Frank suggested first up, but I did not realize at that time that printing compatible name will be this much effort. Can you please send a v4? Thanks, Sekhar
diff --git a/drivers/bus/da8xx-mstpri.c b/drivers/bus/da8xx-mstpri.c index 85f0b53..064eeb9 100644 --- a/drivers/bus/da8xx-mstpri.c +++ b/drivers/bus/da8xx-mstpri.c @@ -16,7 +16,6 @@ #include <linux/platform_device.h> #include <linux/io.h> #include <linux/regmap.h> -#include <linux/of_fdt.h> /* * REVISIT: Linux doesn't have a good framework for the kind of performance @@ -190,6 +189,26 @@ static const struct da8xx_mstpri_board_priorities da8xx_mstpri_board_confs[] = { }, }; +/* + * FIXME Remove this function once of/base gets a general routine for getting + * the machine model/compatible string. + */ +static const char *da8xx_mstpri_machine_get_compatible(void) +{ + struct device_node *root; + const char *compatible; + int ret = -1; + + root = of_find_node_by_path("/"); + if (root) { + ret = of_property_read_string_index(root, "compatible", + 0, &compatible); + of_node_put(root); + } + + return ret ? NULL : compatible; +} + static const struct da8xx_mstpri_board_priorities * da8xx_mstpri_get_board_prio(void) { @@ -227,7 +246,7 @@ static int da8xx_mstpri_probe(struct platform_device *pdev) prio_list = da8xx_mstpri_get_board_prio(); if (!prio_list) { dev_err(dev, "no master priotities defined for board '%s'\n", - of_flat_dt_get_machine_name()); + da8xx_mstpri_machine_get_compatible()); return -EINVAL; }
In order to avoid a section mismatch use a locally implemented routine instead of of_flat_dt_get_machine_name() when printing the error message. Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> --- drivers/bus/da8xx-mstpri.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-)