Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f9f96d9d authored by Dmitry Baryshkov's avatar Dmitry Baryshkov Committed by Amit Pundir
Browse files

UPSTREAM: PM: runtime: add devm_pm_runtime_enable helper 



[ Upstream commit b3636a3a2c51715736d3ec45f635ed03191962ce ]

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: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20210731195034.979084-2-dmitry.baryshkov@linaro.org


Acked-by: default avatarRafael J. Wysocki <rafael@kernel.org>
Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
Stable-dep-of: 3d07a411b4fa ("drm/msm/dsi: Use pm_runtime_resume_and_get to prevent refcnt leaks")
Signed-off-by: default avatarAmit Pundir <amit.pundir@linaro.org>
Change-Id: I43dae0a39612031a88d6cfdb9e7a02b41e3f0ae8
parent b70f9975

drivers/base/power/runtime.c

+17 −0
Original line number Diff line number Diff line
@@ -1475,6 +1475,23 @@ void pm_runtime_enable(struct device *dev) 
}

EXPORT_SYMBOL_GPL(pm_runtime_enable);



static void pm_runtime_disable_action(void *data)

{

	pm_runtime_disable(data);

}



/**

 * devm_pm_runtime_enable - devres-enabled version of pm_runtime_enable.

 * @dev: Device to handle.

 */

int devm_pm_runtime_enable(struct device *dev)

{

	pm_runtime_enable(dev);



	return devm_add_action_or_reset(dev, pm_runtime_disable_action, dev);

}

EXPORT_SYMBOL_GPL(devm_pm_runtime_enable);



/**

 * pm_runtime_forbid - Block runtime PM of a device.

 * @dev: Device to handle.

include/linux/pm_runtime.h

+4 −0
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ extern void pm_runtime_put_suppliers(struct device *dev); 
extern void pm_runtime_new_link(struct device *dev);

extern void pm_runtime_drop_link(struct device_link *link);



extern int devm_pm_runtime_enable(struct device *dev);



static inline void pm_suspend_ignore_children(struct device *dev, bool enable)

{

	dev->power.ignore_children = enable;
@@ -156,6 +158,8 @@ static inline void __pm_runtime_disable(struct device *dev, bool c) {} 
static inline void pm_runtime_allow(struct device *dev) {}

static inline void pm_runtime_forbid(struct device *dev) {}



static inline int devm_pm_runtime_enable(struct device *dev) { return 0; }



static inline void pm_suspend_ignore_children(struct device *dev, bool enable) {}

static inline void pm_runtime_get_noresume(struct device *dev) {}

static inline void pm_runtime_put_noidle(struct device *dev) {}