Skip to content

Commit b3636a3

Browse files
lumagbebarino
authored andcommitted
PM: runtime: add devm_pm_runtime_enable helper
A typical code pattern for pm_runtime_enable() call is to call it in the _probe function and to call pm_runtime_disable() both from _probe error path and from _remove function. For some drivers the whole remove function would consist of the call to pm_remove_disable(). Add helper function to replace this bolierplate piece of code. Calling devm_pm_runtime_enable() removes the need for calling pm_runtime_disable() both in the probe()'s error path and in the remove() function. Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Link: https://lore.kernel.org/r/20210731195034.979084-2-dmitry.baryshkov@linaro.org Acked-by: Rafael J. Wysocki <rafael@kernel.org> Signed-off-by: Stephen Boyd <sboyd@kernel.org>
1 parent 5d9bc01 commit b3636a3

2 files changed

Lines changed: 21 additions & 0 deletions

File tree

drivers/base/power/runtime.c

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1447,6 +1447,23 @@ void pm_runtime_enable(struct device *dev)
14471447
}
14481448
EXPORT_SYMBOL_GPL(pm_runtime_enable);
14491449

1450+
static void pm_runtime_disable_action(void *data)
1451+
{
1452+
pm_runtime_disable(data);
1453+
}
1454+
1455+
/**
1456+
* devm_pm_runtime_enable - devres-enabled version of pm_runtime_enable.
1457+
* @dev: Device to handle.
1458+
*/
1459+
int devm_pm_runtime_enable(struct device *dev)
1460+
{
1461+
pm_runtime_enable(dev);
1462+
1463+
return devm_add_action_or_reset(dev, pm_runtime_disable_action, dev);
1464+
}
1465+
EXPORT_SYMBOL_GPL(devm_pm_runtime_enable);
1466+
14501467
/**
14511468
* pm_runtime_forbid - Block runtime PM of a device.
14521469
* @dev: Device to handle.

include/linux/pm_runtime.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ extern void pm_runtime_put_suppliers(struct device *dev);
5959
extern void pm_runtime_new_link(struct device *dev);
6060
extern void pm_runtime_drop_link(struct device_link *link);
6161

62+
extern int devm_pm_runtime_enable(struct device *dev);
63+
6264
/**
6365
* pm_runtime_get_if_in_use - Conditionally bump up runtime PM usage counter.
6466
* @dev: Target device.
@@ -253,6 +255,8 @@ static inline void __pm_runtime_disable(struct device *dev, bool c) {}
253255
static inline void pm_runtime_allow(struct device *dev) {}
254256
static inline void pm_runtime_forbid(struct device *dev) {}
255257

258+
static inline int devm_pm_runtime_enable(struct device *dev) { return 0; }
259+
256260
static inline void pm_suspend_ignore_children(struct device *dev, bool enable) {}
257261
static inline void pm_runtime_get_noresume(struct device *dev) {}
258262
static inline void pm_runtime_put_noidle(struct device *dev) {}

0 commit comments

Comments
 (0)