Skip to content

Commit 3038b22

Browse files
committed
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
1 parent a84c2a8 commit 3038b22

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

drivers/base/power/main.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,7 @@ static bool dpm_async_fn(struct device *dev, async_func_t func)
602602
reinit_completion(&dev->power.completion);
603603

604604
if (is_async(dev)) {
605-
dev->power.async_in_progress = true;
605+
dev->power.work_in_progress = true;
606606

607607
get_device(dev);
608608

@@ -614,9 +614,9 @@ static bool dpm_async_fn(struct device *dev, async_func_t func)
614614
/*
615615
* Because async_schedule_dev_nocall() above has returned false or it
616616
* has not been called at all, func() is not running and it is safe to
617-
* update the async_in_progress flag without extra synchronization.
617+
* update the work_in_progress flag without extra synchronization.
618618
*/
619-
dev->power.async_in_progress = false;
619+
dev->power.work_in_progress = false;
620620
return false;
621621
}
622622

@@ -736,7 +736,7 @@ static void dpm_noirq_resume_devices(pm_message_t state)
736736
dev = to_device(dpm_noirq_list.next);
737737
list_move_tail(&dev->power.entry, &dpm_late_early_list);
738738

739-
if (!dev->power.async_in_progress) {
739+
if (!dev->power.work_in_progress) {
740740
get_device(dev);
741741

742742
mutex_unlock(&dpm_list_mtx);
@@ -876,7 +876,7 @@ void dpm_resume_early(pm_message_t state)
876876
dev = to_device(dpm_late_early_list.next);
877877
list_move_tail(&dev->power.entry, &dpm_suspended_list);
878878

879-
if (!dev->power.async_in_progress) {
879+
if (!dev->power.work_in_progress) {
880880
get_device(dev);
881881

882882
mutex_unlock(&dpm_list_mtx);
@@ -1049,7 +1049,7 @@ void dpm_resume(pm_message_t state)
10491049
dev = to_device(dpm_suspended_list.next);
10501050
list_move_tail(&dev->power.entry, &dpm_prepared_list);
10511051

1052-
if (!dev->power.async_in_progress) {
1052+
if (!dev->power.work_in_progress) {
10531053
get_device(dev);
10541054

10551055
mutex_unlock(&dpm_list_mtx);

include/linux/pm.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -679,7 +679,7 @@ struct dev_pm_info {
679679
bool wakeup_path:1;
680680
bool syscore:1;
681681
bool no_pm_callbacks:1; /* Owned by the PM core */
682-
bool async_in_progress:1; /* Owned by the PM core */
682+
bool work_in_progress:1; /* Owned by the PM core */
683683
bool smart_suspend:1; /* Owned by the PM core */
684684
bool must_resume:1; /* Owned by the PM core */
685685
bool may_skip_resume:1; /* Set by subsystems */

0 commit comments

Comments
 (0)