mirror of https://github.com/torvalds/linux.git
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>
This commit is contained in:
parent
36ee9770a8
commit
51548c36b3
|
|
@ -465,11 +465,6 @@ static irqreturn_t ecap_cnt_isr(int irq, void *dev_id)
|
||||||
return IRQ_HANDLED;
|
return IRQ_HANDLED;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void ecap_cnt_pm_disable(void *dev)
|
|
||||||
{
|
|
||||||
pm_runtime_disable(dev);
|
|
||||||
}
|
|
||||||
|
|
||||||
static int ecap_cnt_probe(struct platform_device *pdev)
|
static int ecap_cnt_probe(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
struct device *dev = &pdev->dev;
|
struct device *dev = &pdev->dev;
|
||||||
|
|
@ -523,12 +518,9 @@ static int ecap_cnt_probe(struct platform_device *pdev)
|
||||||
|
|
||||||
platform_set_drvdata(pdev, counter_dev);
|
platform_set_drvdata(pdev, counter_dev);
|
||||||
|
|
||||||
pm_runtime_enable(dev);
|
ret = devm_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);
|
|
||||||
if (ret)
|
if (ret)
|
||||||
return dev_err_probe(dev, ret, "failed to add pm disable action\n");
|
return ret;
|
||||||
|
|
||||||
ret = devm_counter_add(dev, counter_dev);
|
ret = devm_counter_add(dev, counter_dev);
|
||||||
if (ret)
|
if (ret)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue