[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20220209163242.430265-5-michael@walle.cc>
Date: Wed, 9 Feb 2022 17:32:39 +0100
From: Michael Walle <michael@...le.cc>
To: linuxppc-dev@...ts.ozlabs.org,
linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org
Cc: Li Yang <leoyang.li@....com>, Ulf Hansson <ulf.hansson@...aro.org>,
Sudeep Holla <Sudeep.Holla@....com>,
Arnd Bergmann <arnd@...db.de>,
Dan Carpenter <dan.carpenter@...cle.com>,
Michael Walle <michael@...le.cc>
Subject: [PATCH v2 4/7] soc: fsl: guts: allocate soc_dev_attr on the heap
This is the last global static variable. Drop it and allocate the memory
on the heap instead.
Signed-off-by: Michael Walle <michael@...le.cc>
---
drivers/soc/fsl/guts.c | 36 +++++++++++++++++++-----------------
1 file changed, 19 insertions(+), 17 deletions(-)
diff --git a/drivers/soc/fsl/guts.c b/drivers/soc/fsl/guts.c
index 4e5675ab5f73..f992064a7f58 100644
--- a/drivers/soc/fsl/guts.c
+++ b/drivers/soc/fsl/guts.c
@@ -20,9 +20,6 @@ struct fsl_soc_die_attr {
u32 mask;
};
-static struct soc_device_attribute soc_dev_attr;
-
-
/* SoC die attribute definition for QorIQ platform */
static const struct fsl_soc_die_attr fsl_soc_die[] = {
/*
@@ -116,6 +113,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 soc_device_attribute *soc_dev_attr;
static struct soc_device *soc_dev;
struct device *dev = &pdev->dev;
const struct fsl_soc_die_attr *soc_die;
@@ -136,12 +134,16 @@ static int fsl_guts_probe(struct platform_device *pdev)
iounmap(regs);
/* Register soc device */
+ soc_dev_attr = devm_kzalloc(dev, sizeof(*soc_dev_attr), GFP_KERNEL);
+ 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 (machine) {
- soc_dev_attr.machine = devm_kstrdup(dev, machine, GFP_KERNEL);
- if (!soc_dev_attr.machine) {
+ soc_dev_attr->machine = devm_kstrdup(dev, machine, GFP_KERNEL);
+ if (!soc_dev_attr->machine) {
of_node_put(root);
return -ENOMEM;
}
@@ -150,30 +152,30 @@ static int fsl_guts_probe(struct platform_device *pdev)
soc_die = fsl_soc_die_match(svr, fsl_soc_die);
if (soc_die) {
- soc_dev_attr.family = devm_kasprintf(dev, GFP_KERNEL,
- "QorIQ %s", soc_die->die);
+ soc_dev_attr->family = devm_kasprintf(dev, GFP_KERNEL,
+ "QorIQ %s", soc_die->die);
} else {
- soc_dev_attr.family = devm_kasprintf(dev, GFP_KERNEL, "QorIQ");
+ soc_dev_attr->family = devm_kasprintf(dev, GFP_KERNEL, "QorIQ");
}
- if (!soc_dev_attr.family)
+ if (!soc_dev_attr->family)
return -ENOMEM;
- soc_dev_attr.soc_id = devm_kasprintf(dev, GFP_KERNEL,
+ soc_dev_attr->soc_id = devm_kasprintf(dev, GFP_KERNEL,
"svr:0x%08x", svr);
- if (!soc_dev_attr.soc_id)
+ if (!soc_dev_attr->soc_id)
return -ENOMEM;
- soc_dev_attr.revision = devm_kasprintf(dev, GFP_KERNEL, "%d.%d",
+ soc_dev_attr->revision = devm_kasprintf(dev, GFP_KERNEL, "%d.%d",
(svr >> 4) & 0xf, svr & 0xf);
- if (!soc_dev_attr.revision)
+ if (!soc_dev_attr->revision)
return -ENOMEM;
- soc_dev = soc_device_register(&soc_dev_attr);
+ soc_dev = soc_device_register(soc_dev_attr);
if (IS_ERR(soc_dev))
return PTR_ERR(soc_dev);
- pr_info("Machine: %s\n", soc_dev_attr.machine);
- pr_info("SoC family: %s\n", soc_dev_attr.family);
+ pr_info("Machine: %s\n", soc_dev_attr->machine);
+ pr_info("SoC family: %s\n", soc_dev_attr->family);
pr_info("SoC ID: %s, Revision: %s\n",
- soc_dev_attr.soc_id, soc_dev_attr.revision);
+ soc_dev_attr->soc_id, soc_dev_attr->revision);
return 0;
}
--
2.30.2
Powered by blists - more mailing lists