Merge branch 'acpi-pnp'
[linux-2.6-microblaze.git] / kernel / power / suspend.c
index ed35a47..9a071be 100644 (file)
 
 #include "power.h"
 
-struct pm_sleep_state pm_states[PM_SUSPEND_MAX] = {
-       [PM_SUSPEND_FREEZE] = { .label = "freeze", .state = PM_SUSPEND_FREEZE },
-       [PM_SUSPEND_STANDBY] = { .label = "standby", },
-       [PM_SUSPEND_MEM] = { .label = "mem", },
-};
+static const char *pm_labels[] = { "mem", "standby", "freeze", };
+const char *pm_states[PM_SUSPEND_MAX];
 
 static const struct platform_suspend_ops *suspend_ops;
 static const struct platform_freeze_ops *freeze_ops;
-
-static bool need_suspend_ops(suspend_state_t state)
-{
-       return state > PM_SUSPEND_FREEZE;
-}
-
 static DECLARE_WAIT_QUEUE_HEAD(suspend_freeze_wait_head);
 static bool suspend_freeze_wake;
 
@@ -97,10 +88,7 @@ static bool relative_states;
 static int __init sleep_states_setup(char *str)
 {
        relative_states = !strncmp(str, "1", 1);
-       if (relative_states) {
-               pm_states[PM_SUSPEND_MEM].state = PM_SUSPEND_FREEZE;
-               pm_states[PM_SUSPEND_FREEZE].state = 0;
-       }
+       pm_states[PM_SUSPEND_FREEZE] = pm_labels[relative_states ? 0 : 2];
        return 1;
 }
 
@@ -113,20 +101,20 @@ __setup("relative_sleep_states=", sleep_states_setup);
 void suspend_set_ops(const struct platform_suspend_ops *ops)
 {
        suspend_state_t i;
-       int j = PM_SUSPEND_MAX - 1;
+       int j = 0;
 
        lock_system_sleep();
 
        suspend_ops = ops;
        for (i = PM_SUSPEND_MEM; i >= PM_SUSPEND_STANDBY; i--)
-               if (valid_state(i))
-                       pm_states[j--].state = i;
-               else if (!relative_states)
-                       pm_states[j--].state = 0;
+               if (valid_state(i)) {
+                       pm_states[i] = pm_labels[j++];
+               } else if (!relative_states) {
+                       pm_states[i] = NULL;
+                       j++;
+               }
 
-       pm_states[j--].state = PM_SUSPEND_FREEZE;
-       while (j >= PM_SUSPEND_MIN)
-               pm_states[j--].state = 0;
+       pm_states[PM_SUSPEND_FREEZE] = pm_labels[j];
 
        unlock_system_sleep();
 }
@@ -145,6 +133,65 @@ int suspend_valid_only_mem(suspend_state_t state)
 }
 EXPORT_SYMBOL_GPL(suspend_valid_only_mem);
 
+static bool sleep_state_supported(suspend_state_t state)
+{
+       return state == PM_SUSPEND_FREEZE || (suspend_ops && suspend_ops->enter);
+}
+
+static int platform_suspend_prepare(suspend_state_t state)
+{
+       return state != PM_SUSPEND_FREEZE && suspend_ops->prepare ?
+               suspend_ops->prepare() : 0;
+}
+
+static int platform_suspend_prepare_late(suspend_state_t state)
+{
+       return state != PM_SUSPEND_FREEZE && suspend_ops->prepare_late ?
+               suspend_ops->prepare_late() : 0;
+}
+
+static void platform_suspend_wake(suspend_state_t state)
+{
+       if (state != PM_SUSPEND_FREEZE && suspend_ops->wake)
+               suspend_ops->wake();
+}
+
+static void platform_suspend_finish(suspend_state_t state)
+{
+       if (state != PM_SUSPEND_FREEZE && suspend_ops->finish)
+               suspend_ops->finish();
+}
+
+static int platform_suspend_begin(suspend_state_t state)
+{
+       if (state == PM_SUSPEND_FREEZE && freeze_ops && freeze_ops->begin)
+               return freeze_ops->begin();
+       else if (suspend_ops->begin)
+               return suspend_ops->begin(state);
+       else
+               return 0;
+}
+
+static void platform_suspend_end(suspend_state_t state)
+{
+       if (state == PM_SUSPEND_FREEZE && freeze_ops && freeze_ops->end)
+               freeze_ops->end();
+       else if (suspend_ops->end)
+               suspend_ops->end();
+}
+
+static void platform_suspend_recover(suspend_state_t state)
+{
+       if (state != PM_SUSPEND_FREEZE && suspend_ops->recover)
+               suspend_ops->recover();
+}
+
+static bool platform_suspend_again(suspend_state_t state)
+{
+       return state != PM_SUSPEND_FREEZE && suspend_ops->suspend_again ?
+               suspend_ops->suspend_again() : false;
+}
+
 static int suspend_test(int level)
 {
 #ifdef CONFIG_PM_DEBUG
@@ -168,7 +215,7 @@ static int suspend_prepare(suspend_state_t state)
 {
        int error;
 
-       if (need_suspend_ops(state) && (!suspend_ops || !suspend_ops->enter))
+       if (!sleep_state_supported(state))
                return -EPERM;
 
        pm_prepare_console();
@@ -214,23 +261,18 @@ static int suspend_enter(suspend_state_t state, bool *wakeup)
 {
        int error;
 
-       if (need_suspend_ops(state) && suspend_ops->prepare) {
-               error = suspend_ops->prepare();
-               if (error)
-                       goto Platform_finish;
-       }
+       error = platform_suspend_prepare(state);
+       if (error)
+               goto Platform_finish;
 
        error = dpm_suspend_end(PMSG_SUSPEND);
        if (error) {
                printk(KERN_ERR "PM: Some devices failed to power down\n");
                goto Platform_finish;
        }
-
-       if (need_suspend_ops(state) && suspend_ops->prepare_late) {
-               error = suspend_ops->prepare_late();
-               if (error)
-                       goto Platform_wake;
-       }
+       error = platform_suspend_prepare_late(state);
+       if (error)
+               goto Platform_wake;
 
        if (suspend_test(TEST_PLATFORM))
                goto Platform_wake;
@@ -278,15 +320,11 @@ static int suspend_enter(suspend_state_t state, bool *wakeup)
        ftrace_start();
 
  Platform_wake:
-       if (need_suspend_ops(state) && suspend_ops->wake)
-               suspend_ops->wake();
-
+       platform_suspend_wake(state);
        dpm_resume_start(PMSG_RESUME);
 
  Platform_finish:
-       if (need_suspend_ops(state) && suspend_ops->finish)
-               suspend_ops->finish();
-
+       platform_suspend_finish(state);
        return error;
 }
 
@@ -299,18 +337,13 @@ int suspend_devices_and_enter(suspend_state_t state)
        int error;
        bool wakeup = false;
 
-       if (need_suspend_ops(state) && !suspend_ops)
+       if (!sleep_state_supported(state))
                return -ENOSYS;
 
-       if (need_suspend_ops(state) && suspend_ops->begin) {
-               error = suspend_ops->begin(state);
-               if (error)
-                       goto Close;
-       } else if (state == PM_SUSPEND_FREEZE && freeze_ops && freeze_ops->begin) {
-               error = freeze_ops->begin();
-               if (error)
-                       goto Close;
-       }
+       error = platform_suspend_begin(state);
+       if (error)
+               goto Close;
+
        suspend_console();
        suspend_test_start();
        error = dpm_suspend_start(PMSG_SUSPEND);
@@ -324,25 +357,20 @@ int suspend_devices_and_enter(suspend_state_t state)
 
        do {
                error = suspend_enter(state, &wakeup);
-       } while (!error && !wakeup && need_suspend_ops(state)
-               && suspend_ops->suspend_again && suspend_ops->suspend_again());
+       } while (!error && !wakeup && platform_suspend_again(state));
 
  Resume_devices:
        suspend_test_start();
        dpm_resume_end(PMSG_RESUME);
        suspend_test_finish("resume devices");
        resume_console();
- Close:
-       if (need_suspend_ops(state) && suspend_ops->end)
-               suspend_ops->end();
-       else if (state == PM_SUSPEND_FREEZE && freeze_ops && freeze_ops->end)
-               freeze_ops->end();
 
+ Close:
+       platform_suspend_end(state);
        return error;
 
  Recover_platform:
-       if (need_suspend_ops(state) && suspend_ops->recover)
-               suspend_ops->recover();
+       platform_suspend_recover(state);
        goto Resume_devices;
 }
 
@@ -395,7 +423,7 @@ static int enter_state(suspend_state_t state)
        printk("done.\n");
        trace_suspend_resume(TPS("sync_filesystems"), 0, false);
 
-       pr_debug("PM: Preparing system for %s sleep\n", pm_states[state].label);
+       pr_debug("PM: Preparing system for %s sleep\n", pm_states[state]);
        error = suspend_prepare(state);
        if (error)
                goto Unlock;
@@ -404,7 +432,7 @@ static int enter_state(suspend_state_t state)
                goto Finish;
 
        trace_suspend_resume(TPS("suspend_enter"), state, false);
-       pr_debug("PM: Entering %s sleep\n", pm_states[state].label);
+       pr_debug("PM: Entering %s sleep\n", pm_states[state]);
        pm_restrict_gfp_mask();
        error = suspend_devices_and_enter(state);
        pm_restore_gfp_mask();