counter: ti-ecap-capture: Use devm_pm_runtime_enable()

[PATCH v3] counter: ti-ecap-capture: Use devm_pm_runtime_enable()

Posted by Waqar Hameed 1 month, 4 weeks ago

There is no need to register a manual `devm` action for
`pm_runtime_disable()` when `devm_pm_runtime_enable()` exists. It does
the same thing (but also calls `pm_runtime_dont_use_autosuspend()`,
which should be fine here).

Moreover, 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, the call to
`dev_err_probe()` is useless. Note that `devm_pm_runtime_enable()` has a
tail call to `devm_add_action_or_reset()` and thus returns that value.
Therefore, replace `dev_err_probe()` with the returning value.

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

* Remove the manual `devm_add_action_or_reset()` and use
  `devm_pm_runtime_enable()` instead.
  
Link to v2: https://lore.kernel.org/lkml/pndms8em7tf.a.out@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 | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/drivers/counter/ti-ecap-capture.c b/drivers/counter/ti-ecap-capture.c
index 3faaf7f60539..3586a7ab9887 100644
--- a/drivers/counter/ti-ecap-capture.c
+++ b/drivers/counter/ti-ecap-capture.c
@@ -465,11 +465,6 @@ static irqreturn_t ecap_cnt_isr(int irq, void *dev_id)
 	return IRQ_HANDLED;
 }
 
-static void ecap_cnt_pm_disable(void *dev)
-{
-	pm_runtime_disable(dev);
-}
-
 static int ecap_cnt_probe(struct platform_device *pdev)
 {
 	struct device *dev = &pdev->dev;
@@ -523,12 +518,9 @@ static int ecap_cnt_probe(struct platform_device *pdev)
 
 	platform_set_drvdata(pdev, counter_dev);
 
-	pm_runtime_enable(dev);
-
-	/* Register a cleanup callback to care for disabling PM */
-	ret = devm_add_action_or_reset(dev, ecap_cnt_pm_disable, dev);
+	ret = devm_pm_runtime_enable(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

Re: [PATCH v3] counter: ti-ecap-capture: Use devm_pm_runtime_enable()

Posted by William Breathitt Gray 1 month, 1 week ago

On Thu, 07 Aug 2025 15:21:08 +0200, Waqar Hameed wrote:
> There is no need to register a manual `devm` action for
> `pm_runtime_disable()` when `devm_pm_runtime_enable()` exists. It does
> the same thing (but also calls `pm_runtime_dont_use_autosuspend()`,
> which should be fine here).
> 
> Moreover, 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, the call to
> `dev_err_probe()` is useless. Note that `devm_pm_runtime_enable()` has a
> tail call to `devm_add_action_or_reset()` and thus returns that value.
> Therefore, replace `dev_err_probe()` with the returning value.
> 
> [...]

Applied, thanks!

[1/1] counter: ti-ecap-capture: Use devm_pm_runtime_enable()
      commit: 51548c36b37d0e84bd43a5f20bcbc36f70e61c5a

Best regards,
-- 
William Breathitt Gray <wbg@kernel.org>

Re: [PATCH v3] counter: ti-ecap-capture: Use devm_pm_runtime_enable()

Posted by Andrew Davis 1 month, 4 weeks ago

On 8/7/25 8:21 AM, Waqar Hameed wrote:
> There is no need to register a manual `devm` action for
> `pm_runtime_disable()` when `devm_pm_runtime_enable()` exists. It does
> the same thing (but also calls `pm_runtime_dont_use_autosuspend()`,
> which should be fine here).
> 
> Moreover, 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, the call to
> `dev_err_probe()` is useless. Note that `devm_pm_runtime_enable()` has a
> tail call to `devm_add_action_or_reset()` and thus returns that value.
> Therefore, replace `dev_err_probe()` with the returning value.
> 
> Signed-off-by: Waqar Hameed <waqar.hameed@axis.com>
> ---

Acked-by: Andrew Davis <afd@ti.com>

> Changes in v3:
> 
> * Remove the manual `devm_add_action_or_reset()` and use
>    `devm_pm_runtime_enable()` instead.
>    
> Link to v2: https://lore.kernel.org/lkml/pndms8em7tf.a.out@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 | 12 ++----------
>   1 file changed, 2 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/counter/ti-ecap-capture.c b/drivers/counter/ti-ecap-capture.c
> index 3faaf7f60539..3586a7ab9887 100644
> --- a/drivers/counter/ti-ecap-capture.c
> +++ b/drivers/counter/ti-ecap-capture.c
> @@ -465,11 +465,6 @@ static irqreturn_t ecap_cnt_isr(int irq, void *dev_id)
>   	return IRQ_HANDLED;
>   }
>   
> -static void ecap_cnt_pm_disable(void *dev)
> -{
> -	pm_runtime_disable(dev);
> -}
> -
>   static int ecap_cnt_probe(struct platform_device *pdev)
>   {
>   	struct device *dev = &pdev->dev;
> @@ -523,12 +518,9 @@ static int ecap_cnt_probe(struct platform_device *pdev)
>   
>   	platform_set_drvdata(pdev, counter_dev);
>   
> -	pm_runtime_enable(dev);
> -
> -	/* Register a cleanup callback to care for disabling PM */
> -	ret = devm_add_action_or_reset(dev, ecap_cnt_pm_disable, dev);
> +	ret = devm_pm_runtime_enable(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