Skip to content

Commit 51548c3

Browse files
whameWilliam Breathitt Gray
authored andcommitted
counter: ti-ecap-capture: Use devm_pm_runtime_enable()
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> Link: https://lore.kernel.org/r/pnda54bjmij.a.out@axis.com Signed-off-by: William Breathitt Gray <wbg@kernel.org>
1 parent 36ee977 commit 51548c3

1 file changed

Lines changed: 2 additions & 10 deletions

File tree

drivers/counter/ti-ecap-capture.c

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -465,11 +465,6 @@ static irqreturn_t ecap_cnt_isr(int irq, void *dev_id)
465465
return IRQ_HANDLED;
466466
}
467467

468-
static void ecap_cnt_pm_disable(void *dev)
469-
{
470-
pm_runtime_disable(dev);
471-
}
472-
473468
static int ecap_cnt_probe(struct platform_device *pdev)
474469
{
475470
struct device *dev = &pdev->dev;
@@ -523,12 +518,9 @@ static int ecap_cnt_probe(struct platform_device *pdev)
523518

524519
platform_set_drvdata(pdev, counter_dev);
525520

526-
pm_runtime_enable(dev);
527-
528-
/* Register a cleanup callback to care for disabling PM */
529-
ret = devm_add_action_or_reset(dev, ecap_cnt_pm_disable, dev);
521+
ret = devm_pm_runtime_enable(dev);
530522
if (ret)
531-
return dev_err_probe(dev, ret, "failed to add pm disable action\n");
523+
return ret;
532524

533525
ret = devm_counter_add(dev, counter_dev);
534526
if (ret)

0 commit comments

Comments
 (0)