From: Andrew Davis <afd@ti.com>
To: Bjorn Andersson <andersson@kernel.org>,
Mathieu Poirier <mathieu.poirier@linaro.org>,
Shawn Guo <shawnguo@kernel.org>,
Sascha Hauer <s.hauer@pengutronix.de>,
Pengutronix Kernel Team <kernel@pengutronix.de>,
Fabio Estevam <festevam@gmail.com>,
NXP Linux Team <linux-imx@nxp.com>,
Konrad Dybcio <konrad.dybcio@linaro.org>,
Patrice Chotard <patrice.chotard@foss.st.com>,
Maxime Coquelin <mcoquelin.stm32@gmail.com>,
Alexandre Torgue <alexandre.torgue@foss.st.com>
Cc: <linux-remoteproc@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>, <linux-arm-msm@vger.kernel.org>,
Andrew Davis <afd@ti.com>
Subject: [PATCH 8/9] remoteproc: st: Use devm_rproc_alloc() helper
Date: Tue, 23 Jan 2024 12:46:31 -0600 [thread overview]
Message-ID: <20240123184632.725054-8-afd@ti.com> (raw)
In-Reply-To: <20240123184632.725054-1-afd@ti.com>
Use the device lifecycle managed allocation function. This helps prevent
mistakes like freeing out of order in cleanup functions and forgetting to
free on error paths.
Signed-off-by: Andrew Davis <afd@ti.com>
---
drivers/remoteproc/st_remoteproc.c | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/drivers/remoteproc/st_remoteproc.c b/drivers/remoteproc/st_remoteproc.c
index cb163766c56d5..1340be9d01101 100644
--- a/drivers/remoteproc/st_remoteproc.c
+++ b/drivers/remoteproc/st_remoteproc.c
@@ -347,23 +347,21 @@ static int st_rproc_probe(struct platform_device *pdev)
int enabled;
int ret, i;
- rproc = rproc_alloc(dev, np->name, &st_rproc_ops, NULL, sizeof(*ddata));
+ rproc = devm_rproc_alloc(dev, np->name, &st_rproc_ops, NULL, sizeof(*ddata));
if (!rproc)
return -ENOMEM;
rproc->has_iommu = false;
ddata = rproc->priv;
ddata->config = (struct st_rproc_config *)device_get_match_data(dev);
- if (!ddata->config) {
- ret = -ENODEV;
- goto free_rproc;
- }
+ if (!ddata->config)
+ return -ENODEV;
platform_set_drvdata(pdev, rproc);
ret = st_rproc_parse_dt(pdev);
if (ret)
- goto free_rproc;
+ return ret;
enabled = st_rproc_state(pdev);
if (enabled < 0) {
@@ -439,8 +437,7 @@ static int st_rproc_probe(struct platform_device *pdev)
mbox_free_channel(ddata->mbox_chan[i]);
free_clk:
clk_unprepare(ddata->clk);
-free_rproc:
- rproc_free(rproc);
+
return ret;
}
@@ -456,8 +453,6 @@ static void st_rproc_remove(struct platform_device *pdev)
for (i = 0; i < ST_RPROC_MAX_VRING * MBOX_MAX; i++)
mbox_free_channel(ddata->mbox_chan[i]);
-
- rproc_free(rproc);
}
static struct platform_driver st_rproc_driver = {
--
2.39.2
next prev parent reply other threads:[~2024-01-23 18:46 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-23 18:46 [PATCH 1/9] remoteproc: imx_dsp_rproc: Use devm_rproc_alloc() helper Andrew Davis
2024-01-23 18:46 ` [PATCH 2/9] remoteproc: imx_rproc: " Andrew Davis
2024-01-24 22:12 ` Iuliana Prodan
2024-01-23 18:46 ` [PATCH 3/9] remoteproc: qcom_q6v5_adsp: " Andrew Davis
2024-01-23 18:46 ` [PATCH 4/9] remoteproc: qcom_q6v5_mss: " Andrew Davis
2024-01-23 18:46 ` [PATCH 5/9] remoteproc: qcom_q6v5_pas: " Andrew Davis
2024-01-23 18:46 ` [PATCH 6/9] remoteproc: qcom_q6v5_wcss: " Andrew Davis
2024-02-02 20:51 ` Unnathi Chalicheemala
2024-02-02 21:14 ` Andrew Davis
2024-02-02 21:37 ` Unnathi Chalicheemala
2024-01-23 18:46 ` [PATCH 7/9] remoteproc: qcom_wcnss: " Andrew Davis
2024-01-23 18:46 ` Andrew Davis [this message]
2024-01-23 18:46 ` [PATCH 9/9] remoteproc: stm32: " Andrew Davis
2024-02-02 18:41 ` Mathieu Poirier
2024-01-24 22:11 ` [PATCH 1/9] remoteproc: imx_dsp_rproc: " Iuliana Prodan
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=20240123184632.725054-8-afd@ti.com \
--to=afd@ti.com \
--cc=alexandre.torgue@foss.st.com \
--cc=andersson@kernel.org \
--cc=festevam@gmail.com \
--cc=kernel@pengutronix.de \
--cc=konrad.dybcio@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-remoteproc@vger.kernel.org \
--cc=mathieu.poirier@linaro.org \
--cc=mcoquelin.stm32@gmail.com \
--cc=patrice.chotard@foss.st.com \
--cc=s.hauer@pengutronix.de \
--cc=shawnguo@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