When `devm_add_action_or_reset()` fails, it is due to a failed memory
allocation and will thus return `-ENOMEM`. `dev_err_probe()` doesn't do
anything when error is `-ENOMEM`. Therefore, remove the useless call to
`dev_err_probe()` when `devm_add_action_or_reset()` fails, and just
return the value instead.

Signed-off-by: Waqar Hameed <waqar.hameed@axis.com>
---
Changes in v2:

* Split the patch to one seperate patch for each sub-system.

Link to v1: https://lore.kernel.org/all/pnd7c0s6ji2.fsf@axis.com/

 drivers/counter/ti-ecap-capture.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/counter/ti-ecap-capture.c b/drivers/counter/ti-ecap-capture.c
index 3faaf7f60539..114f2d33f193 100644
--- a/drivers/counter/ti-ecap-capture.c
+++ b/drivers/counter/ti-ecap-capture.c
@@ -528,7 +528,7 @@ static int ecap_cnt_probe(struct platform_device *pdev)
 	/* Register a cleanup callback to care for disabling PM */
 	ret = devm_add_action_or_reset(dev, ecap_cnt_pm_disable, dev);
 	if (ret)
-		return dev_err_probe(dev, ret, "failed to add pm disable action\n");
+		return ret;
 
 	ret = devm_counter_add(dev, counter_dev);
 	if (ret)

base-commit: 260f6f4fda93c8485c8037865c941b42b9cba5d2
-- 
2.39.5

On 8/5/25 4:33 AM, Waqar Hameed wrote:
> When `devm_add_action_or_reset()` fails, it is due to a failed memory
> allocation and will thus return `-ENOMEM`. `dev_err_probe()` doesn't do
> anything when error is `-ENOMEM`. Therefore, remove the useless call to
> `dev_err_probe()` when `devm_add_action_or_reset()` fails, and just
> return the value instead.
> 
> Signed-off-by: Waqar Hameed <waqar.hameed@axis.com>
> ---
> Changes in v2:
> 
> * Split the patch to one seperate patch for each sub-system.
> 
> Link to v1: https://lore.kernel.org/all/pnd7c0s6ji2.fsf@axis.com/
> 
>   drivers/counter/ti-ecap-capture.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/counter/ti-ecap-capture.c b/drivers/counter/ti-ecap-capture.c
> index 3faaf7f60539..114f2d33f193 100644
> --- a/drivers/counter/ti-ecap-capture.c
> +++ b/drivers/counter/ti-ecap-capture.c
> @@ -528,7 +528,7 @@ static int ecap_cnt_probe(struct platform_device *pdev)
>   	/* Register a cleanup callback to care for disabling PM */
>   	ret = devm_add_action_or_reset(dev, ecap_cnt_pm_disable, dev);

Now that we have devm_pm_runtime_enable(), you can just turn the pm_enable()
call 3 lines above this into that, and not need this manual devm action at all.

Andrew

>   	if (ret)
> -		return dev_err_probe(dev, ret, "failed to add pm disable action\n");
> +		return ret;
>   
>   	ret = devm_counter_add(dev, counter_dev);
>   	if (ret)
> 
> base-commit: 260f6f4fda93c8485c8037865c941b42b9cba5d2

On Tue, Aug 05, 2025 at 13:10 -0500 Andrew Davis <afd@ti.com> wrote:

> On 8/5/25 4:33 AM, Waqar Hameed wrote:
>> When `devm_add_action_or_reset()` fails, it is due to a failed memory
>> allocation and will thus return `-ENOMEM`. `dev_err_probe()` doesn't do
>> anything when error is `-ENOMEM`. Therefore, remove the useless call to
>> `dev_err_probe()` when `devm_add_action_or_reset()` fails, and just
>> return the value instead.
>>
>> Signed-off-by: Waqar Hameed <waqar.hameed@axis.com>
>> ---
>> Changes in v2:
>>
>> * Split the patch to one seperate patch for each sub-system.
>>
>> Link to v1: https://lore.kernel.org/all/pnd7c0s6ji2.fsf@axis.com/
>>
>>   drivers/counter/ti-ecap-capture.c | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/counter/ti-ecap-capture.c b/drivers/counter/ti-ecap-capture.c
>> index 3faaf7f60539..114f2d33f193 100644
>> --- a/drivers/counter/ti-ecap-capture.c
>> +++ b/drivers/counter/ti-ecap-capture.c
>> @@ -528,7 +528,7 @@ static int ecap_cnt_probe(struct platform_device *pdev)
>>       /* Register a cleanup callback to care for disabling PM */
>>       ret = devm_add_action_or_reset(dev, ecap_cnt_pm_disable, dev);
>
> Now that we have devm_pm_runtime_enable(), you can just turn the pm_enable()
> call 3 lines above this into that, and not need this manual devm action at all.

That's true! However, `devm_pm_runtime_enable` also runs
`pm_runtime_dont_use_autosuspend()` on exit. I'm guessing we are fine
with that extra side-effect so I'll change to that instead.

>
>>       if (ret)
>> -             return dev_err_probe(dev, ret, "failed to add pm disable action\n");
>> +             return ret;
>>
>>       ret = devm_counter_add(dev, counter_dev);
>>       if (ret)
>>
>> base-commit: 260f6f4fda93c8485c8037865c941b42b9cba5d2