diff options
author | Magnus Damm <damm@igel.co.jp> | 2009-05-14 18:53:26 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rjw@sisk.pl> | 2009-06-12 15:32:31 -0400 |
commit | e39a71ef80877f4e30d808af9acceec80f4d2f7c (patch) | |
tree | e9d4ff1618328cf3a3fafee04621b9776ca169de /kernel/power/main.c | |
parent | 1380a37e3da5d9e14ea5c2a4c6ab2b307a2798ea (diff) |
PM: Rename device_power_down/up()
Rename the functions performing "_noirq" dev_pm_ops
operations from device_power_down() and device_power_up()
to device_suspend_noirq() and device_resume_noirq().
The new function names are chosen to show that the functions
are responsible for calling the _noirq() versions to finalize
the suspend/resume operation. The current function names do
not perform power down/up anymore so the names may be misleading.
Global function renames:
- device_power_down() -> device_suspend_noirq()
- device_power_up() -> device_resume_noirq()
Static function renames:
- suspend_device_noirq() -> __device_suspend_noirq()
- resume_device_noirq() -> __device_resume_noirq()
Signed-off-by: Magnus Damm <damm@igel.co.jp>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Acked-by: Len Brown <lenb@kernel.org>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'kernel/power/main.c')
-rw-r--r-- | kernel/power/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/power/main.c b/kernel/power/main.c index 868028280d13..2f6638ee03c0 100644 --- a/kernel/power/main.c +++ b/kernel/power/main.c | |||
@@ -295,7 +295,7 @@ static int suspend_enter(suspend_state_t state) | |||
295 | return error; | 295 | return error; |
296 | } | 296 | } |
297 | 297 | ||
298 | error = device_power_down(PMSG_SUSPEND); | 298 | error = device_suspend_noirq(PMSG_SUSPEND); |
299 | if (error) { | 299 | if (error) { |
300 | printk(KERN_ERR "PM: Some devices failed to power down\n"); | 300 | printk(KERN_ERR "PM: Some devices failed to power down\n"); |
301 | goto Platfrom_finish; | 301 | goto Platfrom_finish; |
@@ -335,7 +335,7 @@ static int suspend_enter(suspend_state_t state) | |||
335 | suspend_ops->wake(); | 335 | suspend_ops->wake(); |
336 | 336 | ||
337 | Power_up_devices: | 337 | Power_up_devices: |
338 | device_power_up(PMSG_RESUME); | 338 | device_resume_noirq(PMSG_RESUME); |
339 | 339 | ||
340 | Platfrom_finish: | 340 | Platfrom_finish: |
341 | if (suspend_ops->finish) | 341 | if (suspend_ops->finish) |