[PATCH V2] memory: tegra186-emc: Fix missing put_bpmp

[PATCH V2] memory: tegra186-emc: Fix missing put_bpmp

[Jon Hunter]

Commit a52ddb98a674 ("memory: tegra186-emc: Simplify and handle deferred
probe with dev_err_probe()") accidently dropped a call to 'put_bpmp' to
release a handle to the BPMP when getting the EMC clock fails. Fix this
by restoring the 'goto put_bpmp' if devm_clk_get() fails.

Fixes: a52ddb98a674 ("memory: tegra186-emc: Simplify and handle deferred probe with dev_err_probe()")
Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
---
Changes since V1:
- Fixed dev_err_probe message format

Please note that the commit hash reference is based upon the hash in
the -next tree.

 drivers/memory/tegra/tegra186-emc.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/memory/tegra/tegra186-emc.c b/drivers/memory/tegra/tegra186-emc.c
index 74be09968baa..43595fd9c256 100644
--- a/drivers/memory/tegra/tegra186-emc.c
+++ b/drivers/memory/tegra/tegra186-emc.c
@@ -448,9 +448,11 @@ static int tegra186_emc_probe(struct platform_device *pdev)
 				     "failed to get BPMP\n");
 
 	emc->clk = devm_clk_get(&pdev->dev, "emc");
-	if (IS_ERR(emc->clk))
-		return dev_err_probe(&pdev->dev, PTR_ERR(emc->clk),
-				     "failed to get EMC clock\n");
+	if (IS_ERR(emc->clk)) {
+		err = PTR_ERR(emc->clk);
+		dev_err_probe(&pdev->dev, err, "failed to get EMC clock\n");
+		goto put_bpmp;
+	}
 
 	platform_set_drvdata(pdev, emc);
 	emc->dev = &pdev->dev;
-- 
2.43.0

Re: [PATCH V2] memory: tegra186-emc: Fix missing put_bpmp

[Krzysztof Kozlowski]

On 06/11/2025 18:32, Jon Hunter wrote:
> Commit a52ddb98a674 ("memory: tegra186-emc: Simplify and handle deferred
> probe with dev_err_probe()") accidently dropped a call to 'put_bpmp' to
> release a handle to the BPMP when getting the EMC clock fails. Fix this
> by restoring the 'goto put_bpmp' if devm_clk_get() fails.
> 
> Fixes: a52ddb98a674 ("memory: tegra186-emc: Simplify and handle deferred probe with dev_err_probe()")
> Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
> ---
> Changes since V1:
> - Fixed dev_err_probe message format
> 
> Please note that the commit hash reference is based upon the hash in
> the -next tree.
> 
>  drivers/memory/tegra/tegra186-emc.c | 8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/memory/tegra/tegra186-emc.c b/drivers/memory/tegra/tegra186-emc.c
> index 74be09968baa..43595fd9c256 100644
> --- a/drivers/memory/tegra/tegra186-emc.c
> +++ b/drivers/memory/tegra/tegra186-emc.c
> @@ -448,9 +448,11 @@ static int tegra186_emc_probe(struct platform_device *pdev)
>  				     "failed to get BPMP\n");
>  
>  	emc->clk = devm_clk_get(&pdev->dev, "emc");
> -	if (IS_ERR(emc->clk))
> -		return dev_err_probe(&pdev->dev, PTR_ERR(emc->clk),
> -				     "failed to get EMC clock\n");
> +	if (IS_ERR(emc->clk)) {
> +		err = PTR_ERR(emc->clk);
> +		dev_err_probe(&pdev->dev, err, "failed to get EMC clock\n");

This still should use standard dev_err_probe syntax, so:

err = dev_err_probe(..., PTR_ERR(), "....");

which saves you one line with earlier assignment.


Best regards,
Krzysztof

Re: [PATCH V2] memory: tegra186-emc: Fix missing put_bpmp

[Jon Hunter]

On 06/11/2025 18:35, Krzysztof Kozlowski wrote:
> On 06/11/2025 18:32, Jon Hunter wrote:
>> Commit a52ddb98a674 ("memory: tegra186-emc: Simplify and handle deferred
>> probe with dev_err_probe()") accidently dropped a call to 'put_bpmp' to
>> release a handle to the BPMP when getting the EMC clock fails. Fix this
>> by restoring the 'goto put_bpmp' if devm_clk_get() fails.
>>
>> Fixes: a52ddb98a674 ("memory: tegra186-emc: Simplify and handle deferred probe with dev_err_probe()")
>> Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
>> ---
>> Changes since V1:
>> - Fixed dev_err_probe message format
>>
>> Please note that the commit hash reference is based upon the hash in
>> the -next tree.
>>
>>   drivers/memory/tegra/tegra186-emc.c | 8 +++++---
>>   1 file changed, 5 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/memory/tegra/tegra186-emc.c b/drivers/memory/tegra/tegra186-emc.c
>> index 74be09968baa..43595fd9c256 100644
>> --- a/drivers/memory/tegra/tegra186-emc.c
>> +++ b/drivers/memory/tegra/tegra186-emc.c
>> @@ -448,9 +448,11 @@ static int tegra186_emc_probe(struct platform_device *pdev)
>>   				     "failed to get BPMP\n");
>>   
>>   	emc->clk = devm_clk_get(&pdev->dev, "emc");
>> -	if (IS_ERR(emc->clk))
>> -		return dev_err_probe(&pdev->dev, PTR_ERR(emc->clk),
>> -				     "failed to get EMC clock\n");
>> +	if (IS_ERR(emc->clk)) {
>> +		err = PTR_ERR(emc->clk);
>> +		dev_err_probe(&pdev->dev, err, "failed to get EMC clock\n");
> 
> This still should use standard dev_err_probe syntax, so:
> 
> err = dev_err_probe(..., PTR_ERR(), "....");
> 
> which saves you one line with earlier assignment.

Yes that is indeed better!

Jon

-- 
nvpublic