Received-SPF: pass (google.com: domain of linux-kernel+bounces-50618-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Message-ID: <073bcb5c-6718-4a64-8d14-281a589d2205@quicinc.com>
Date: Fri, 2 Feb 2024 13:37:58 -0800
Precedence: bulk
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH 6/9] remoteproc: qcom_q6v5_wcss: Use devm_rproc_alloc()
 helper
Content-Language: en-US
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>
References: <20240123184632.725054-1-afd@ti.com>
 <20240123184632.725054-6-afd@ti.com>
 <256072b3-c1d0-4e11-9456-bbd50b84a310@quicinc.com>
 <60d46d58-ad77-47e8-8ff6-bc05db7cf1be@ti.com>
From: Unnathi Chalicheemala <quic_uchalich@quicinc.com>
In-Reply-To: <60d46d58-ad77-47e8-8ff6-bc05db7cf1be@ti.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 8bit

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 = {