iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PM: Rename device_power_down/up()

Browse Source 
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>
This commit is contained in:
Magnus Damm
2009-05-15 00:53:26 +02:00
committed by Rafael J. Wysocki
parent 1380a37e3d
commit e39a71ef80
7 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
kernel/kexec.c
View File

@ -1452,13 +1452,13 @@ int kernel_kexec(void)
if (error)
goto Resume_console;
/* At this point, device_suspend() has been called,
* but *not* device_power_down(). We *must*
* device_power_down() now. Otherwise, drivers for
* but *not* device_suspend_noirq(). We *must* call
* device_suspend_noirq() now. Otherwise, drivers for
* some devices (e.g. interrupt controllers) become
* desynchronized with the actual state of the
* hardware at resume time, and evil weirdness ensues.
*/
error = device_power_down(PMSG_FREEZE);
error = device_suspend_noirq(PMSG_FREEZE);
if (error)
goto Resume_devices;
error = disable_nonboot_cpus();
@ -1486,7 +1486,7 @@ int kernel_kexec(void)
local_irq_enable();
Enable_cpus:
enable_nonboot_cpus();
device_power_up(PMSG_RESTORE);
device_resume_noirq(PMSG_RESTORE);
Resume_devices:
device_resume(PMSG_RESTORE);
Resume_console:

16
kernel/power/disk.c
View File

@ -216,12 +216,12 @@ static int create_image(int platform_mode)
return error;
/* At this point, device_suspend() has been called, but *not*
* device_power_down(). We *must* call device_power_down() now.
* device_suspend_noirq(). We *must* call device_suspend_noirq() now.
* Otherwise, drivers for some devices (e.g. interrupt controllers)
* become desynchronized with the actual state of the hardware
* at resume time, and evil weirdness ensues.
*/
error = device_power_down(PMSG_FREEZE);
error = device_suspend_noirq(PMSG_FREEZE);
if (error) {
printk(KERN_ERR "PM: Some devices failed to power down, "
"aborting hibernation\n");
@ -262,7 +262,7 @@ static int create_image(int platform_mode)
Power_up:
sysdev_resume();
/* NOTE: device_power_up() is just a resume() for devices
/* NOTE: device_resume_noirq() is just a resume() for devices
* that suspended with irqs off ... no overall powerup.
*/
@ -275,7 +275,7 @@ static int create_image(int platform_mode)
Platform_finish:
platform_finish(platform_mode);
device_power_up(in_suspend ?
device_resume_noirq(in_suspend ?
(error ? PMSG_RECOVER : PMSG_THAW) : PMSG_RESTORE);
return error;
@ -339,7 +339,7 @@ static int resume_target_kernel(bool platform_mode)
{
int error;
error = device_power_down(PMSG_QUIESCE);
error = device_suspend_noirq(PMSG_QUIESCE);
if (error) {
printk(KERN_ERR "PM: Some devices failed to power down, "
"aborting resume\n");
@ -394,7 +394,7 @@ static int resume_target_kernel(bool platform_mode)
Cleanup:
platform_restore_cleanup(platform_mode);
device_power_up(PMSG_RECOVER);
device_resume_noirq(PMSG_RECOVER);
return error;
}
@ -454,7 +454,7 @@ int hibernation_platform_enter(void)
goto Resume_devices;
}
error = device_power_down(PMSG_HIBERNATE);
error = device_suspend_noirq(PMSG_HIBERNATE);
if (error)
goto Resume_devices;
@ -479,7 +479,7 @@ int hibernation_platform_enter(void)
Platofrm_finish:
hibernation_ops->finish();
device_power_up(PMSG_RESTORE);
device_suspend_noirq(PMSG_RESTORE);
Resume_devices:
entering_platform_hibernation = false;

4
kernel/power/main.c
View File

@ -295,7 +295,7 @@ static int suspend_enter(suspend_state_t state)
return error;
}
error = device_power_down(PMSG_SUSPEND);
error = device_suspend_noirq(PMSG_SUSPEND);
if (error) {
printk(KERN_ERR "PM: Some devices failed to power down\n");
goto Platfrom_finish;
@ -335,7 +335,7 @@ static int suspend_enter(suspend_state_t state)
suspend_ops->wake();
Power_up_devices:
device_power_up(PMSG_RESUME);
device_resume_noirq(PMSG_RESUME);
Platfrom_finish:
if (suspend_ops->finish)