From: Nicolas Frayer <nfrayer@baylibre.com>
To: nm@ti.com, ssantosh@kernel.org
Cc: linux-arm-kernel@lists.infradead.org, khilman@baylibre.com,
glaroque@baylibre.com, granquet@baylibre.com,
Nicolas Frayer <nfrayer@baylibre.com>
Subject: [PATCH RESEND 1/2] soc: ti: Convert allocations to devm
Date: Mon, 3 Oct 2022 18:22:36 +0200 [thread overview]
Message-ID: <20221003162237.30451-2-nfrayer@baylibre.com> (raw)
In-Reply-To: <20221003162237.30451-1-nfrayer@baylibre.com>
Changed the memory and resource allocations in the probe function
to devm. Also added a remove callback.
Signed-off-by: Nicolas Frayer <nfrayer@baylibre.com>
---
drivers/soc/ti/k3-socinfo.c | 36 +++++++++++++++++++-----------------
1 file changed, 19 insertions(+), 17 deletions(-)
diff --git a/drivers/soc/ti/k3-socinfo.c b/drivers/soc/ti/k3-socinfo.c
index 91f441ee6175..a29f5a23395f 100644
--- a/drivers/soc/ti/k3-socinfo.c
+++ b/drivers/soc/ti/k3-socinfo.c
@@ -96,21 +96,18 @@ static int k3_chipinfo_probe(struct platform_device *pdev)
partno_id = (jtag_id & CTRLMMR_WKUP_JTAGID_PARTNO_MASK) >>
CTRLMMR_WKUP_JTAGID_PARTNO_SHIFT;
- soc_dev_attr = kzalloc(sizeof(*soc_dev_attr), GFP_KERNEL);
+ soc_dev_attr = devm_kzalloc(&pdev->dev, sizeof(*soc_dev_attr), GFP_KERNEL);
if (!soc_dev_attr)
return -ENOMEM;
- soc_dev_attr->revision = kasprintf(GFP_KERNEL, "SR%x.0", variant);
- if (!soc_dev_attr->revision) {
- ret = -ENOMEM;
- goto err;
- }
+ soc_dev_attr->revision = devm_kasprintf(&pdev->dev, GFP_KERNEL, "SR%x.0", variant);
+ if (!soc_dev_attr->revision)
+ return -ENOMEM;
ret = k3_chipinfo_partno_to_names(partno_id, soc_dev_attr);
if (ret) {
dev_err(dev, "Unknown SoC JTAGID[0x%08X]\n", jtag_id);
- ret = -ENODEV;
- goto err_free_rev;
+ return -ENODEV;
}
node = of_find_node_by_path("/");
@@ -118,22 +115,26 @@ static int k3_chipinfo_probe(struct platform_device *pdev)
of_node_put(node);
soc_dev = soc_device_register(soc_dev_attr);
- if (IS_ERR(soc_dev)) {
- ret = PTR_ERR(soc_dev);
- goto err_free_rev;
- }
+ if (IS_ERR(soc_dev))
+ return PTR_ERR(soc_dev);
+
+ platform_set_drvdata(pdev, soc_dev);
dev_info(dev, "Family:%s rev:%s JTAGID[0x%08x] Detected\n",
soc_dev_attr->family,
soc_dev_attr->revision, jtag_id);
return 0;
+}
+
+static int k3_chipinfo_remove(struct platform_device *pdev)
+{
+ struct soc_device *soc_dev = platform_get_drvdata(pdev);
-err_free_rev:
- kfree(soc_dev_attr->revision);
-err:
- kfree(soc_dev_attr);
- return ret;
+ if (soc_dev != NULL)
+ soc_device_unregister(soc_dev);
+
+ return 0;
}
static const struct of_device_id k3_chipinfo_of_match[] = {
@@ -147,6 +148,7 @@ static struct platform_driver k3_chipinfo_driver = {
.of_match_table = k3_chipinfo_of_match,
},
.probe = k3_chipinfo_probe,
+ .remove = k3_chipinfo_remove,
};
static int __init k3_chipinfo_init(void)
--
2.25.1
_______________________________________________
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-10-03 16:24 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-03 16:22 [PATCH RESEND 0/2] soc: ti: Convert K3 SoC info driver to module Nicolas Frayer
2022-10-03 16:22 ` Nicolas Frayer [this message]
2022-10-03 16:22 ` [PATCH RESEND 2/2] soc: ti: Add module build support Nicolas Frayer
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=20221003162237.30451-2-nfrayer@baylibre.com \
--to=nfrayer@baylibre.com \
--cc=glaroque@baylibre.com \
--cc=granquet@baylibre.com \
--cc=khilman@baylibre.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=nm@ti.com \
--cc=ssantosh@kernel.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).