PM core: rename suspend and resume functions

This patch (as1241) renames a bunch of functions in the PM core.
Rather than go through a boring list of name changes, suffice it to
say that in the end we have a bunch of pairs of functions:

	device_resume_noirq	dpm_resume_noirq
	device_resume		dpm_resume
	device_complete		dpm_complete
	device_suspend_noirq	dpm_suspend_noirq
	device_suspend		dpm_suspend
	device_prepare		dpm_prepare

in which device_X does the X operation on a single device and dpm_X
invokes device_X for all devices in the dpm_list.

In addition, the old dpm_power_up and device_resume_noirq have been
combined into a single function (dpm_resume_noirq).

Lastly, dpm_suspend_start and dpm_resume_end are the renamed versions
of the former top-level device_suspend and device_resume routines.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Acked-by: Magnus Damm <damm@igel.co.jp>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>

1 files changed, 4 insertions, 4 deletions

diff --git a/kernel/power/main.c b/kernel/power/main.c
index 2f6638ee03c..46386b9f8dd 100644
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -295,7 +295,7 @@ static int suspend_enter(suspend_state_t state)
                         return error;
         }
 
-        error = device_suspend_noirq(PMSG_SUSPEND);
+        error = dpm_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_resume_noirq(PMSG_RESUME);
+        dpm_resume_noirq(PMSG_RESUME);
 
  Platfrom_finish:
         if (suspend_ops->finish)
@@ -363,7 +363,7 @@ int suspend_devices_and_enter(suspend_state_t state)
         }
         suspend_console();
         suspend_test_start();
-        error = device_suspend(PMSG_SUSPEND);
+        error = dpm_suspend_start(PMSG_SUSPEND);
         if (error) {
                 printk(KERN_ERR "PM: Some devices failed to suspend\n");
                 goto Recover_platform;
@@ -376,7 +376,7 @@ int suspend_devices_and_enter(suspend_state_t state)
 
  Resume_devices:
         suspend_test_start();
-        device_resume(PMSG_RESUME);
+        dpm_resume_end(PMSG_RESUME);
         suspend_test_finish("resume devices");
         resume_console();
  Close: