PM: Rename device_power_down/up()

[sfrench/cifs-2.6.git] / arch / x86 / kernel / apm_32.c

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_suspend(PMSG_SUSPEND);
 

-       device_power_down(PMSG_SUSPEND);
+       device_suspend_noirq(PMSG_SUSPEND);

 
        local_irq_disable();
        sysdev_suspend(PMSG_SUSPEND);
 
        local_irq_disable();
        sysdev_suspend(PMSG_SUSPEND);


@@ -1259,7 +1259,7 @@ static int suspend(int vetoable)
        sysdev_resume();
        local_irq_enable();
 
        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);
 
        device_resume(PMSG_RESUME);
        queue_event(APM_NORMAL_RESUME, NULL);


@@ -1277,7 +1277,7 @@ static void standby(void)
 {
        int err;
 
 {
        int err;
 

-       device_power_down(PMSG_SUSPEND);
+       device_suspend_noirq(PMSG_SUSPEND);

 
        local_irq_disable();
        sysdev_suspend(PMSG_SUSPEND);
 
        local_irq_disable();
        sysdev_suspend(PMSG_SUSPEND);


@@ -1291,7 +1291,7 @@ static void standby(void)
        sysdev_resume();
        local_irq_enable();
 
        sysdev_resume();
        local_irq_enable();
 

-       device_power_up(PMSG_RESUME);
+       device_resume_noirq(PMSG_RESUME);

 }
 
 static apm_event_t get_event(void)
 }
 
 static apm_event_t get_event(void)