mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-09-18 22:14:16 +00:00
PM: sleep: Rename power.async_in_progress to power.work_in_progress
Rename the async_in_progress field in struct dev_pm_info to work_in_progress as after subsequent changes it will mean work in general rather than just async work. No functional impact. Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org> Link: https://patch.msgid.link/3338693.aeNJFYEL58@rjwysocki.net
This commit is contained in:
parent
a84c2a885b
commit
3038b22bc0
2 changed files with 7 additions and 7 deletions
|
|
@ -602,7 +602,7 @@ static bool dpm_async_fn(struct device *dev, async_func_t func)
|
|||
reinit_completion(&dev->power.completion);
|
||||
|
||||
if (is_async(dev)) {
|
||||
dev->power.async_in_progress = true;
|
||||
dev->power.work_in_progress = true;
|
||||
|
||||
get_device(dev);
|
||||
|
||||
|
|
@ -614,9 +614,9 @@ static bool dpm_async_fn(struct device *dev, async_func_t func)
|
|||
/*
|
||||
* Because async_schedule_dev_nocall() above has returned false or it
|
||||
* has not been called at all, func() is not running and it is safe to
|
||||
* update the async_in_progress flag without extra synchronization.
|
||||
* update the work_in_progress flag without extra synchronization.
|
||||
*/
|
||||
dev->power.async_in_progress = false;
|
||||
dev->power.work_in_progress = false;
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
@ -736,7 +736,7 @@ static void dpm_noirq_resume_devices(pm_message_t state)
|
|||
dev = to_device(dpm_noirq_list.next);
|
||||
list_move_tail(&dev->power.entry, &dpm_late_early_list);
|
||||
|
||||
if (!dev->power.async_in_progress) {
|
||||
if (!dev->power.work_in_progress) {
|
||||
get_device(dev);
|
||||
|
||||
mutex_unlock(&dpm_list_mtx);
|
||||
|
|
@ -876,7 +876,7 @@ void dpm_resume_early(pm_message_t state)
|
|||
dev = to_device(dpm_late_early_list.next);
|
||||
list_move_tail(&dev->power.entry, &dpm_suspended_list);
|
||||
|
||||
if (!dev->power.async_in_progress) {
|
||||
if (!dev->power.work_in_progress) {
|
||||
get_device(dev);
|
||||
|
||||
mutex_unlock(&dpm_list_mtx);
|
||||
|
|
@ -1049,7 +1049,7 @@ void dpm_resume(pm_message_t state)
|
|||
dev = to_device(dpm_suspended_list.next);
|
||||
list_move_tail(&dev->power.entry, &dpm_prepared_list);
|
||||
|
||||
if (!dev->power.async_in_progress) {
|
||||
if (!dev->power.work_in_progress) {
|
||||
get_device(dev);
|
||||
|
||||
mutex_unlock(&dpm_list_mtx);
|
||||
|
|
|
|||
|
|
@ -679,7 +679,7 @@ struct dev_pm_info {
|
|||
bool wakeup_path:1;
|
||||
bool syscore:1;
|
||||
bool no_pm_callbacks:1; /* Owned by the PM core */
|
||||
bool async_in_progress:1; /* Owned by the PM core */
|
||||
bool work_in_progress:1; /* Owned by the PM core */
|
||||
bool smart_suspend:1; /* Owned by the PM core */
|
||||
bool must_resume:1; /* Owned by the PM core */
|
||||
bool may_skip_resume:1; /* Set by subsystems */
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue