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>

diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
index 49e0939bac4211ba35f32240af5e92ed905ec578..31ae547da15970897801c454d1fecc395fe60a7c 100644 (file)
--- a/arch/x86/kernel/apm_32.c
+++ b/arch/x86/kernel/apm_32.c
@@ -1235,7 +1235,7 @@ static int suspend(int vetoable)
 
        device_suspend(PMSG_SUSPEND);
 
-       device_power_down(PMSG_SUSPEND);
+       device_suspend_noirq(PMSG_SUSPEND);
 
        local_irq_disable();
        sysdev_suspend(PMSG_SUSPEND);
@@ -1259,7 +1259,7 @@ static int suspend(int vetoable)
        sysdev_resume();
        local_irq_enable();
 
-       device_power_up(PMSG_RESUME);
+       device_resume_noirq(PMSG_RESUME);
 
        device_resume(PMSG_RESUME);
        queue_event(APM_NORMAL_RESUME, NULL);
@@ -1277,7 +1277,7 @@ static void standby(void)
 {
        int err;
 
-       device_power_down(PMSG_SUSPEND);
+       device_suspend_noirq(PMSG_SUSPEND);
 
        local_irq_disable();
        sysdev_suspend(PMSG_SUSPEND);
@@ -1291,7 +1291,7 @@ static void standby(void)
        sysdev_resume();
        local_irq_enable();
 
-       device_power_up(PMSG_RESUME);
+       device_resume_noirq(PMSG_RESUME);
 }
 
 static apm_event_t get_event(void)

diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index 3e4bc699bc0f30349be3ed75b9ecc28cdb77ddf1..c5a35bc9d63b37aea24585763f2fc518a9583177 100644 (file)
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -315,13 +315,13 @@ static void pm_dev_err(struct device *dev, pm_message_t state, char *info,
 /*------------------------- Resume routines -------------------------*/
 
 /**
- *     resume_device_noirq - Power on one device (early resume).
+ *     __device_resume_noirq - Power on one device (early resume).
  *     @dev:   Device.
  *     @state: PM transition of the system being carried out.
  *
  *     Must be called with interrupts disabled.
  */
-static int resume_device_noirq(struct device *dev, pm_message_t state)
+static int __device_resume_noirq(struct device *dev, pm_message_t state)
 {
        int error = 0;
 
@@ -363,7 +363,7 @@ static void dpm_power_up(pm_message_t state)
                        int error;
 
                        dev->power.status = DPM_OFF;
-                       error = resume_device_noirq(dev, state);
+                       error = __device_resume_noirq(dev, state);
                        if (error)
                                pm_dev_err(dev, state, " early", error);
                }
@@ -371,18 +371,18 @@ static void dpm_power_up(pm_message_t state)
 }
 
 /**
- *     device_power_up - Turn on all devices that need special attention.
+ *     device_resume_noirq - Turn on all devices that need special attention.
  *     @state: PM transition of the system being carried out.
  *
  *     Call the "early" resume handlers and enable device drivers to receive
  *     interrupts.
  */
-void device_power_up(pm_message_t state)
+void device_resume_noirq(pm_message_t state)
 {
        dpm_power_up(state);
        resume_device_irqs();
 }
-EXPORT_SYMBOL_GPL(device_power_up);
+EXPORT_SYMBOL_GPL(device_resume_noirq);
 
 /**
  *     resume_device - Restore state for one device.
@@ -577,13 +577,13 @@ static pm_message_t resume_event(pm_message_t sleep_state)
 }
 
 /**
- *     suspend_device_noirq - Shut down one device (late suspend).
+ *     __device_suspend_noirq - Shut down one device (late suspend).
  *     @dev:   Device.
  *     @state: PM transition of the system being carried out.
  *
  *     This is called with interrupts off and only a single CPU running.
  */
-static int suspend_device_noirq(struct device *dev, pm_message_t state)
+static int __device_suspend_noirq(struct device *dev, pm_message_t state)
 {
        int error = 0;
 
@@ -602,7 +602,7 @@ static int suspend_device_noirq(struct device *dev, pm_message_t state)
 }
 
 /**
- *     device_power_down - Shut down special devices.
+ *     device_suspend_noirq - Shut down special devices.
  *     @state: PM transition of the system being carried out.
  *
  *     Prevent device drivers from receiving interrupts and call the "late"
@@ -610,7 +610,7 @@ static int suspend_device_noirq(struct device *dev, pm_message_t state)
  *
  *     Must be called under dpm_list_mtx.
  */
-int device_power_down(pm_message_t state)
+int device_suspend_noirq(pm_message_t state)
 {
        struct device *dev;
        int error = 0;
@@ -618,7 +618,7 @@ int device_power_down(pm_message_t state)
        suspend_device_irqs();
        mutex_lock(&dpm_list_mtx);
        list_for_each_entry_reverse(dev, &dpm_list, power.entry) {
-               error = suspend_device_noirq(dev, state);
+               error = __device_suspend_noirq(dev, state);
                if (error) {
                        pm_dev_err(dev, state, " late", error);
                        break;
@@ -627,10 +627,10 @@ int device_power_down(pm_message_t state)
        }
        mutex_unlock(&dpm_list_mtx);
        if (error)
-               device_power_up(resume_event(state));
+               device_resume_noirq(resume_event(state));
        return error;
 }
-EXPORT_SYMBOL_GPL(device_power_down);
+EXPORT_SYMBOL_GPL(device_suspend_noirq);
 
 /**
  *     suspend_device - Save state of one device.

diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c
index fddc2025dece777c513a7a7a72f8537751bf1834..d5b327ac4039b3d67b68ed1b9bb185ee2bf93e00 100644 (file)
--- a/drivers/xen/manage.c
+++ b/drivers/xen/manage.c
@@ -43,7 +43,7 @@ static int xen_suspend(void *data)
        if (err) {
                printk(KERN_ERR "xen_suspend: sysdev_suspend failed: %d\n",
                        err);
-               device_power_up(PMSG_RESUME);
+               device_resume_noirq(PMSG_RESUME);
                return err;
        }
 
@@ -69,7 +69,7 @@ static int xen_suspend(void *data)
        }
 
        sysdev_resume();
-       device_power_up(PMSG_RESUME);
+       device_resume_noirq(PMSG_RESUME);
 
        return 0;
 }
@@ -101,9 +101,9 @@ static void do_suspend(void)
        printk(KERN_DEBUG "suspending xenstore...\n");
        xs_suspend();
 
-       err = device_power_down(PMSG_SUSPEND);
+       err = device_suspend_noirq(PMSG_SUSPEND);
        if (err) {
-               printk(KERN_ERR "device_power_down failed: %d\n", err);
+               printk(KERN_ERR "device_suspend_noirq failed: %d\n", err);
                goto resume_devices;
        }
 
@@ -119,7 +119,7 @@ static void do_suspend(void)
        } else
                xs_suspend_cancel();
 
-       device_power_up(PMSG_RESUME);
+       device_resume_noirq(PMSG_RESUME);
 
 resume_devices:
        device_resume(PMSG_RESUME);

diff --git a/include/linux/pm.h b/include/linux/pm.h
index 1d4e2d289821d1d74f9e203dc966ed0ed1e5e0ef..2170252074f35349d25eca9cbd413c226d57ad31 100644 (file)
--- a/include/linux/pm.h
+++ b/include/linux/pm.h
@@ -382,12 +382,12 @@ struct dev_pm_info {
 #ifdef CONFIG_PM_SLEEP
 extern void device_pm_lock(void);
 extern int sysdev_resume(void);
-extern void device_power_up(pm_message_t state);
+extern void device_resume_noirq(pm_message_t state);
 extern void device_resume(pm_message_t state);
 
 extern void device_pm_unlock(void);
 extern int sysdev_suspend(pm_message_t state);
-extern int device_power_down(pm_message_t state);
+extern int device_suspend_noirq(pm_message_t state);
 extern int device_suspend(pm_message_t state);
 extern int device_prepare_suspend(pm_message_t state);
 

diff --git a/kernel/kexec.c b/kernel/kexec.c
index e4983770913b915e85fb2906e4f9ffd766d0694f..5a3da87adae07d46c8b7679839eba854d648227f 100644 (file)
--- a/kernel/kexec.c
+++ b/kernel/kexec.c
@@ -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:

diff --git a/kernel/power/disk.c b/kernel/power/disk.c
index 5cb080e7eebd9a388d31a12425283c6b768a6e59..1c18bc894a2db95b7b56dbf6c76114ace6c107ec 100644 (file)
--- a/kernel/power/disk.c
+++ b/kernel/power/disk.c
@@ -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;

diff --git a/kernel/power/main.c b/kernel/power/main.c
index 868028280d13474811810098cfa0f1923d212b32..2f6638ee03c05649b8039a6fc6bd7fa01d1e19fc 100644 (file)
--- 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_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)