From: Unnathi Chalicheemala <quic_uchalich@quicinc.com>
To: Andrew Davis <afd@ti.com>, 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>
Subject: Re: [PATCH 6/9] remoteproc: qcom_q6v5_wcss: Use devm_rproc_alloc() helper
Date: Fri, 2 Feb 2024 13:37:58 -0800 [thread overview]
Message-ID: <073bcb5c-6718-4a64-8d14-281a589d2205@quicinc.com> (raw)
In-Reply-To: <60d46d58-ad77-47e8-8ff6-bc05db7cf1be@ti.com>
On 2/2/2024 1:14 PM, Andrew Davis wrote:
> On 2/2/24 2:51 PM, Unnathi Chalicheemala wrote:
>>
>>
>> On 1/23/2024 10:46 AM, Andrew Davis wrote:
>>> 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/qcom_q6v5_wcss.c | 24 +++++++++---------------
>>> 1 file changed, 9 insertions(+), 15 deletions(-)
>>>
>>> diff --git a/drivers/remoteproc/qcom_q6v5_wcss.c b/drivers/remoteproc/qcom_q6v5_wcss.c
>>> index cff1fa07d1def..94f68c919ee62 100644
>>> --- a/drivers/remoteproc/qcom_q6v5_wcss.c
>>> +++ b/drivers/remoteproc/qcom_q6v5_wcss.c
>>> @@ -1011,8 +1011,8 @@ static int q6v5_wcss_probe(struct platform_device *pdev)
>>> if (!desc)
>>> return -EINVAL;
>>> - rproc = rproc_alloc(&pdev->dev, pdev->name, desc->ops,
>>> - desc->firmware_name, sizeof(*wcss));
>>> + rproc = devm_rproc_alloc(&pdev->dev, pdev->name, desc->ops,
>>> + desc->firmware_name, sizeof(*wcss));
>>> if (!rproc) {
>>> dev_err(&pdev->dev, "failed to allocate rproc\n");
>>> return -ENOMEM;
>>> @@ -1027,29 +1027,29 @@ static int q6v5_wcss_probe(struct platform_device *pdev)
>>> ret = q6v5_wcss_init_mmio(wcss, pdev);
>>> if (ret)
>>> - goto free_rproc;
>>> + return ret;
>>> ret = q6v5_alloc_memory_region(wcss);
>>> if (ret)
>>> - goto free_rproc;
>>> + return ret;
>>> if (wcss->version == WCSS_QCS404) {
>>> ret = q6v5_wcss_init_clock(wcss);
>>> if (ret)
>>> - goto free_rproc;
>>> + return ret;
>>> ret = q6v5_wcss_init_regulator(wcss);
>>> if (ret)
>>> - goto free_rproc;
>>> + return ret;
>>> }
>>> ret = q6v5_wcss_init_reset(wcss, desc);
>>> if (ret)
>>> - goto free_rproc;
>>> + return ret;
>>> ret = qcom_q6v5_init(&wcss->q6v5, pdev, rproc, desc->crash_reason_smem, NULL, NULL);
>>> if (ret)
>>> - goto free_rproc;
>>> + return ret;
>>> qcom_add_glink_subdev(rproc, &wcss->glink_subdev, "q6wcss");
>>> qcom_add_ssr_subdev(rproc, &wcss->ssr_subdev, "q6wcss");
>>> @@ -1061,16 +1061,11 @@ static int q6v5_wcss_probe(struct platform_device *pdev)
>>> ret = rproc_add(rproc);
>>> if (ret)
>>> - goto free_rproc;
>>> + return ret;
>>> platform_set_drvdata(pdev, rproc);
>>> return 0;
>>> -
>>> -free_rproc:
>>> - rproc_free(rproc);
>>> -
>>> - return ret;
>>
>> This return statement should stay, right?
>>
>
> No path goes to "free_rproc" anymore, so we always do the "return 0;"
> above on non-error paths.
>
> Andrew
>
You're right, thanks all QCOM peripheral patches LGTM.
>>> }
>>> static void q6v5_wcss_remove(struct platform_device *pdev)
>>> @@ -1080,7 +1075,6 @@ static void q6v5_wcss_remove(struct platform_device *pdev)
>>> qcom_q6v5_deinit(&wcss->q6v5);
>>> rproc_del(rproc);
>>> - rproc_free(rproc);
>>> }
>>> static const struct wcss_data wcss_ipq8074_res_init = {
next prev parent reply other threads:[~2024-02-02 21:38 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 [this message]
2024-01-23 18:46 ` [PATCH 7/9] remoteproc: qcom_wcnss: " Andrew Davis
2024-01-23 18:46 ` [PATCH 8/9] remoteproc: st: " Andrew Davis
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=073bcb5c-6718-4a64-8d14-281a589d2205@quicinc.com \
--to=quic_uchalich@quicinc.com \
--cc=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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).