Commit c021c1b3 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

PM: Move two sleep-related functions under CONFIG_PM_SLEEP 



Since pm_runtime_force_resume() and pm_runtime_need_not_resume() are only
needed for handling system-wide PM transitions, there is no reason to
compile them in if CONFIG_PM_SLEEP is unset.

Accordingly, move them under CONFIG_PM_SLEEP and make the static
inline stub for pm_runtime_force_resume() return an error to indicate
that it should not be used outside CONFIG_PM_SLEEP.

Putting pm_runtime_force_resume() also allows subsequent changes to
be more straightforward because this function is going to access a
device PM flag that is only defined when CONFIG_PM_SLEEP is set.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Link: https://patch.msgid.link/3384523.aeNJFYEL58@rjwysocki.net
parent 200046d8

drivers/base/power/runtime.c

+11 −7
Original line number Diff line number Diff line
@@ -1941,13 +1941,6 @@ void pm_runtime_drop_link(struct device_link *link) 
	pm_request_idle(link->supplier);

}



bool pm_runtime_need_not_resume(struct device *dev)

{

	return atomic_read(&dev->power.usage_count) <= 1 &&

		(atomic_read(&dev->power.child_count) == 0 ||

		 dev->power.ignore_children);

}



/**

 * pm_runtime_force_suspend - Force a device into suspend state if needed.

 * @dev: Device to suspend.
@@ -2009,6 +2002,8 @@ int pm_runtime_force_suspend(struct device *dev) 
}

EXPORT_SYMBOL_GPL(pm_runtime_force_suspend);



#ifdef CONFIG_PM_SLEEP



/**

 * pm_runtime_force_resume - Force a device into resume state if needed.

 * @dev: Device to resume.
@@ -2052,3 +2047,12 @@ int pm_runtime_force_resume(struct device *dev) 
	return ret;

}

EXPORT_SYMBOL_GPL(pm_runtime_force_resume);



bool pm_runtime_need_not_resume(struct device *dev)

{

	return atomic_read(&dev->power.usage_count) <= 1 &&

		(atomic_read(&dev->power.child_count) == 0 ||

		 dev->power.ignore_children);

}



#endif /* CONFIG_PM_SLEEP */

include/linux/pm_runtime.h

+12 −4
Original line number Diff line number Diff line
@@ -66,9 +66,7 @@ static inline bool queue_pm_work(struct work_struct *work) 


extern int pm_generic_runtime_suspend(struct device *dev);

extern int pm_generic_runtime_resume(struct device *dev);

extern bool pm_runtime_need_not_resume(struct device *dev);

extern int pm_runtime_force_suspend(struct device *dev);

extern int pm_runtime_force_resume(struct device *dev);



extern int __pm_runtime_idle(struct device *dev, int rpmflags);

extern int __pm_runtime_suspend(struct device *dev, int rpmflags);
@@ -257,9 +255,7 @@ static inline bool queue_pm_work(struct work_struct *work) { return false; } 


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

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

static inline bool pm_runtime_need_not_resume(struct device *dev) {return true; }

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

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



static inline int __pm_runtime_idle(struct device *dev, int rpmflags)

{
@@ -330,6 +326,18 @@ static inline void pm_runtime_release_supplier(struct device_link *link) {} 


#endif /* !CONFIG_PM */



#ifdef CONFIG_PM_SLEEP



bool pm_runtime_need_not_resume(struct device *dev);

int pm_runtime_force_resume(struct device *dev);



#else /* !CONFIG_PM_SLEEP */



static inline bool pm_runtime_need_not_resume(struct device *dev) {return true; }

static inline int pm_runtime_force_resume(struct device *dev) { return -ENXIO; }



#endif /* CONFIG_PM_SLEEP */



/**

 * pm_runtime_idle - Conditionally set up autosuspend of a device or suspend it.

 * @dev: Target device.