Skip to contentSkip to conversation

counter: ti-ecap-capture: Remove error print for devm_add_action_or_reset()

PATCH In review Waqar Hameed 2 participants 3 messages Aug 5, 2025 – Aug 6, 2025

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 counter: ti-ecap-capture: Remove error print for devm_add_action_or_reset()

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.

---
Changes in v2:

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

Link to v1: https://lore.kernel.org/all/[email protected]/

 drivers/counter/ti-ecap-capture.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/counter/ti-ecap-capture.c +1 -1
index 3faaf7f60539..114f2d33f193 100644
@@ -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

Signature · 1 line
2.39.5
#1 lore raw
Quoted 22 lines · Waqar Hameed

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.

---
Changes in v2:

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

Link to v1: https://lore.kernel.org/all/[email protected]/

  drivers/counter/ti-ecap-capture.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/counter/ti-ecap-capture.c +0 -0
index 3faaf7f60539..114f2d33f193 100644

drivers/counter/ti-ecap-capture.c static int ecap_cnt_probe(struct platform_device *pdev) · line 529

Quoted 2 lines
drivers/counter/ti-ecap-capture.c +0 -0
@@ -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

Quoted 8 lines
drivers/counter/ti-ecap-capture.c +1 -1
  	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 lore raw
Quoted 18 lines · On Tue, Aug 05, 2025 at 13:10 -0500 Andrew Davis <[email protected]> wrote:
Quoted 17 lines · Waqar Hameed

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.

---
Changes in v2:

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

Link to v1: https://lore.kernel.org/all/[email protected]/

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

drivers/counter/ti-ecap-capture.c static int ecap_cnt_probe(struct platform_device *pdev) · line 529

Quoted 7 lines
drivers/counter/ti-ecap-capture.c +0 -0
index 3faaf7f60539..114f2d33f193 100644
@@ -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.

Quoted 9 lines
Quoted 9 lines
drivers/counter/ti-ecap-capture.c +1 -1
      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