From: Michael Walle <michael@walle.cc>
To: linuxppc-dev@lists.ozlabs.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Cc: Shawn Guo <shawnguo@kernel.org>, Li Yang <leoyang.li@nxp.com>,
Ulf Hansson <ulf.hansson@linaro.org>,
Sudeep Holla <Sudeep.Holla@arm.com>,
Arnd Bergmann <arnd@arndb.de>,
Dan Carpenter <dan.carpenter@oracle.com>,
Michael Walle <michael@walle.cc>
Subject: [PATCH RESEND v2 5/7] soc: fsl: guts: use of_root instead of own reference
Date: Mon, 4 Apr 2022 11:56:07 +0200 [thread overview]
Message-ID: <20220404095609.3932782-6-michael@walle.cc> (raw)
In-Reply-To: <20220404095609.3932782-1-michael@walle.cc>
There is already a global of_root reference. Use that instead of getting
one on our own. We don't need to care about the reference count either
this way.
Signed-off-by: Michael Walle <michael@walle.cc>
Acked-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/soc/fsl/guts.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/drivers/soc/fsl/guts.c b/drivers/soc/fsl/guts.c
index 44e7a9bf6392..585cbd9d8224 100644
--- a/drivers/soc/fsl/guts.c
+++ b/drivers/soc/fsl/guts.c
@@ -112,7 +112,7 @@ static const struct fsl_soc_die_attr *fsl_soc_die_match(
static int fsl_guts_probe(struct platform_device *pdev)
{
- struct device_node *root, *np = pdev->dev.of_node;
+ struct device_node *np = pdev->dev.of_node;
struct soc_device_attribute *soc_dev_attr;
static struct soc_device *soc_dev;
struct device *dev = &pdev->dev;
@@ -138,17 +138,13 @@ static int fsl_guts_probe(struct platform_device *pdev)
if (!soc_dev_attr)
return -ENOMEM;
- root = of_find_node_by_path("/");
- if (of_property_read_string(root, "model", &machine))
- of_property_read_string_index(root, "compatible", 0, &machine);
+ if (of_property_read_string(of_root, "model", &machine))
+ of_property_read_string_index(of_root, "compatible", 0, &machine);
if (machine) {
soc_dev_attr->machine = devm_kstrdup(dev, machine, GFP_KERNEL);
- if (!soc_dev_attr->machine) {
- of_node_put(root);
+ if (!soc_dev_attr->machine)
return -ENOMEM;
- }
}
- of_node_put(root);
soc_die = fsl_soc_die_match(svr, fsl_soc_die);
if (soc_die) {
--
2.30.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2022-04-04 9:59 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-04 9:56 [PATCH RESEND v2 0/7] soc: fsl: guts: cleanups and serial_number support Michael Walle
2022-04-04 9:56 ` [PATCH RESEND v2 1/7] soc: fsl: guts: machine variable might be unset Michael Walle
2022-04-04 9:56 ` [PATCH RESEND v2 2/7] soc: fsl: guts: remove module_exit() and fsl_guts_remove() Michael Walle
2022-04-04 9:56 ` [PATCH RESEND v2 3/7] soc: fsl: guts: embed fsl_guts_get_svr() in probe() Michael Walle
2022-04-04 9:56 ` [PATCH RESEND v2 4/7] soc: fsl: guts: allocate soc_dev_attr on the heap Michael Walle
2022-04-04 9:56 ` Michael Walle [this message]
2022-04-04 9:56 ` [PATCH RESEND v2 6/7] soc: fsl: guts: drop platform driver Michael Walle
2022-04-04 9:56 ` [PATCH RESEND v2 7/7] soc: fsl: guts: add serial_number support Michael Walle
2022-06-22 11:03 ` [PATCH RESEND v2 0/7] soc: fsl: guts: cleanups and " Michael Walle
2022-06-27 6:53 ` Shawn Guo
2022-06-28 18:20 ` Leo Li
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220404095609.3932782-6-michael@walle.cc \
--to=michael@walle.cc \
--cc=Sudeep.Holla@arm.com \
--cc=arnd@arndb.de \
--cc=dan.carpenter@oracle.com \
--cc=leoyang.li@nxp.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=shawnguo@kernel.org \
--cc=ulf.hansson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).