summaryrefslogtreecommitdiffstats
path: root/kernel/power
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-09-30 02:22:24 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-09-30 21:05:59 +0200
commitebc3e41e371620bae6c315c9174bcb2d6c4e9ae7 (patch)
tree94dabd2683ee5b6a89741e0e22b4f20a95b12fac /kernel/power
parent2a8a8ce651d3a88fdf83e2ed15633c8d19292108 (diff)
downloadlinux-ebc3e41e371620bae6c315c9174bcb2d6c4e9ae7.tar.bz2
PM / sleep: Rename platform suspend/resume functions in suspend.c
Rename several local functions related to platform handling during system suspend resume in suspend.c so that their names better reflect their roles. Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'kernel/power')
-rw-r--r--kernel/power/suspend.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
index 58ae98b7dc2b..a25e768d92b5 100644
--- a/kernel/power/suspend.c
+++ b/kernel/power/suspend.c
@@ -144,19 +144,19 @@ static int platform_suspend_prepare(suspend_state_t state)
suspend_ops->prepare() : 0;
}
-static int platform_suspend_prepare_late(suspend_state_t state)
+static int platform_suspend_prepare_noirq(suspend_state_t state)
{
return state != PM_SUSPEND_FREEZE && suspend_ops->prepare_late ?
suspend_ops->prepare_late() : 0;
}
-static void platform_suspend_wake(suspend_state_t state)
+static void platform_resume_noirq(suspend_state_t state)
{
if (state != PM_SUSPEND_FREEZE && suspend_ops->wake)
suspend_ops->wake();
}
-static void platform_suspend_finish(suspend_state_t state)
+static void platform_resume_finish(suspend_state_t state)
{
if (state != PM_SUSPEND_FREEZE && suspend_ops->finish)
suspend_ops->finish();
@@ -172,7 +172,7 @@ static int platform_suspend_begin(suspend_state_t state)
return 0;
}
-static void platform_suspend_end(suspend_state_t state)
+static void platform_resume_end(suspend_state_t state)
{
if (state == PM_SUSPEND_FREEZE && freeze_ops && freeze_ops->end)
freeze_ops->end();
@@ -180,7 +180,7 @@ static void platform_suspend_end(suspend_state_t state)
suspend_ops->end();
}
-static void platform_suspend_recover(suspend_state_t state)
+static void platform_recover(suspend_state_t state)
{
if (state != PM_SUSPEND_FREEZE && suspend_ops->recover)
suspend_ops->recover();
@@ -275,7 +275,7 @@ static int suspend_enter(suspend_state_t state, bool *wakeup)
printk(KERN_ERR "PM: noirq suspend of devices failed\n");
goto Devices_early_resume;
}
- error = platform_suspend_prepare_late(state);
+ error = platform_suspend_prepare_noirq(state);
if (error)
goto Platform_wake;
@@ -323,14 +323,14 @@ static int suspend_enter(suspend_state_t state, bool *wakeup)
enable_nonboot_cpus();
Platform_wake:
- platform_suspend_wake(state);
+ platform_resume_noirq(state);
dpm_resume_noirq(PMSG_RESUME);
Devices_early_resume:
dpm_resume_early(PMSG_RESUME);
Platform_finish:
- platform_suspend_finish(state);
+ platform_resume_finish(state);
return error;
}
@@ -374,11 +374,11 @@ int suspend_devices_and_enter(suspend_state_t state)
trace_suspend_resume(TPS("resume_console"), state, false);
Close:
- platform_suspend_end(state);
+ platform_resume_end(state);
return error;
Recover_platform:
- platform_suspend_recover(state);
+ platform_recover(state);
goto Resume_devices;
}