| Message ID | 1063e5a4738d897adcaffce2ab8e4e45f07998ff.1635969326.git.christophe.jaillet@wanadoo.fr (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/2] soc: fsl: guts: Revert commit 3c0d64e867ed | expand |
On Thu, Nov 4, 2021 at 4:09 AM Christophe JAILLET <christophe.jaillet@wanadoo.fr> wrote: > > This reverts commit 3c0d64e867ed > ("soc: fsl: guts: reuse machine name from device tree"). > > A following patch will fix the missing memory allocation failure check > instead. > > Suggested-by: Tyrel Datwyler <tyreld@linux.ibm.com> > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Applied for next. Thanks. > --- > This is a follow-up of discussion in: > https://lore.kernel.org/kernel-janitors/b12e8c5c5d6ab3061d9504de8fbaefcad6bbc385.1629321668.git.christophe.jaillet@wanadoo.fr/ > --- > drivers/soc/fsl/guts.c | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/drivers/soc/fsl/guts.c b/drivers/soc/fsl/guts.c > index 072473a16f4d..af7741eafc57 100644 > --- a/drivers/soc/fsl/guts.c > +++ b/drivers/soc/fsl/guts.c > @@ -28,7 +28,6 @@ struct fsl_soc_die_attr { > static struct guts *guts; > static struct soc_device_attribute soc_dev_attr; > static struct soc_device *soc_dev; > -static struct device_node *root; > > > /* SoC die attribute definition for QorIQ platform */ > @@ -138,7 +137,7 @@ static u32 fsl_guts_get_svr(void) > > static int fsl_guts_probe(struct platform_device *pdev) > { > - struct device_node *np = pdev->dev.of_node; > + struct device_node *root, *np = pdev->dev.of_node; > struct device *dev = &pdev->dev; > const struct fsl_soc_die_attr *soc_die; > const char *machine; > @@ -159,8 +158,9 @@ static int fsl_guts_probe(struct platform_device *pdev) > root = of_find_node_by_path("/"); > if (of_property_read_string(root, "model", &machine)) > of_property_read_string_index(root, "compatible", 0, &machine); > + of_node_put(root); > if (machine) > - soc_dev_attr.machine = machine; > + soc_dev_attr.machine = devm_kstrdup(dev, machine, GFP_KERNEL); > > svr = fsl_guts_get_svr(); > soc_die = fsl_soc_die_match(svr, fsl_soc_die); > @@ -195,7 +195,6 @@ static int fsl_guts_probe(struct platform_device *pdev) > static int fsl_guts_remove(struct platform_device *dev) > { > soc_device_unregister(soc_dev); > - of_node_put(root); > return 0; > } > > -- > 2.30.2 >
diff --git a/drivers/soc/fsl/guts.c b/drivers/soc/fsl/guts.c index 072473a16f4d..af7741eafc57 100644 --- a/drivers/soc/fsl/guts.c +++ b/drivers/soc/fsl/guts.c @@ -28,7 +28,6 @@ struct fsl_soc_die_attr { static struct guts *guts; static struct soc_device_attribute soc_dev_attr; static struct soc_device *soc_dev; -static struct device_node *root; /* SoC die attribute definition for QorIQ platform */ @@ -138,7 +137,7 @@ static u32 fsl_guts_get_svr(void) static int fsl_guts_probe(struct platform_device *pdev) { - struct device_node *np = pdev->dev.of_node; + struct device_node *root, *np = pdev->dev.of_node; struct device *dev = &pdev->dev; const struct fsl_soc_die_attr *soc_die; const char *machine; @@ -159,8 +158,9 @@ static int fsl_guts_probe(struct platform_device *pdev) root = of_find_node_by_path("/"); if (of_property_read_string(root, "model", &machine)) of_property_read_string_index(root, "compatible", 0, &machine); + of_node_put(root); if (machine) - soc_dev_attr.machine = machine; + soc_dev_attr.machine = devm_kstrdup(dev, machine, GFP_KERNEL); svr = fsl_guts_get_svr(); soc_die = fsl_soc_die_match(svr, fsl_soc_die); @@ -195,7 +195,6 @@ static int fsl_guts_probe(struct platform_device *pdev) static int fsl_guts_remove(struct platform_device *dev) { soc_device_unregister(soc_dev); - of_node_put(root); return 0; }
This reverts commit 3c0d64e867ed ("soc: fsl: guts: reuse machine name from device tree"). A following patch will fix the missing memory allocation failure check instead. Suggested-by: Tyrel Datwyler <tyreld@linux.ibm.com> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> --- This is a follow-up of discussion in: https://lore.kernel.org/kernel-janitors/b12e8c5c5d6ab3061d9504de8fbaefcad6bbc385.1629321668.git.christophe.jaillet@wanadoo.fr/ --- drivers/soc/fsl/guts.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)