]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/blobdiff - kernel/power/main.c
Driver Core: switch all dynamic ksets to kobj_sysfs_ops
[linux-2.6-omap-h63xx.git] / kernel / power / main.c
index 4d26ad394fb3bbeab4787013f173fa5aaa153ee7..b8139493b856bcdad1ead4010efaa790a95422f4 100644 (file)
 #include <linux/resume-trace.h>
 #include <linux/freezer.h>
 #include <linux/vmstat.h>
+#include <linux/syscalls.h>
 
 #include "power.h"
 
 BLOCKING_NOTIFIER_HEAD(pm_chain_head);
 
-/*This is just an arbitrary number */
-#define FREE_PAGE_NUMBER (100)
-
 DEFINE_MUTEX(pm_mutex);
 
-struct pm_ops *pm_ops;
+unsigned int pm_flags;
+EXPORT_SYMBOL(pm_flags);
+
+#ifdef CONFIG_SUSPEND
+
+/* This is just an arbitrary number */
+#define FREE_PAGE_NUMBER (100)
+
+static struct platform_suspend_ops *suspend_ops;
 
 /**
- *     pm_set_ops - Set the global power method table. 
+ *     suspend_set_ops - Set the global suspend method table.
  *     @ops:   Pointer to ops structure.
  */
 
-void pm_set_ops(struct pm_ops * ops)
+void suspend_set_ops(struct platform_suspend_ops *ops)
 {
        mutex_lock(&pm_mutex);
-       pm_ops = ops;
+       suspend_ops = ops;
        mutex_unlock(&pm_mutex);
 }
 
 /**
- * pm_valid_only_mem - generic memory-only valid callback
+ * suspend_valid_only_mem - generic memory-only valid callback
  *
- * pm_ops drivers that implement mem suspend only and only need
+ * Platform drivers that implement mem suspend only and only need
  * to check for that in their .valid callback can use this instead
  * of rolling their own .valid callback.
  */
-int pm_valid_only_mem(suspend_state_t state)
+int suspend_valid_only_mem(suspend_state_t state)
 {
        return state == PM_SUSPEND_MEM;
 }
 
-
-static inline void pm_finish(suspend_state_t state)
-{
-       if (pm_ops->finish)
-               pm_ops->finish(state);
-}
-
 /**
  *     suspend_prepare - Do prep work before entering low-power state.
- *     @state:         State we're entering.
  *
- *     This is common code that is called for each state that we're 
- *     entering. Allocate a console, stop all processes, then make sure
- *     the platform can enter the requested state.
+ *     This is common code that is called for each state that we're entering.
+ *     Run suspend notifiers, allocate a console and stop all processes.
  */
-
-static int suspend_prepare(suspend_state_t state)
+static int suspend_prepare(void)
 {
        int error;
        unsigned int free_pages;
 
-       if (!pm_ops || !pm_ops->enter)
+       if (!suspend_ops || !suspend_ops->enter)
                return -EPERM;
 
        error = pm_notifier_call_chain(PM_SUSPEND_PREPARE);
@@ -91,43 +87,18 @@ static int suspend_prepare(suspend_state_t state)
                goto Thaw;
        }
 
-       if ((free_pages = global_page_state(NR_FREE_PAGES))
-                       < FREE_PAGE_NUMBER) {
+       free_pages = global_page_state(NR_FREE_PAGES);
+       if (free_pages < FREE_PAGE_NUMBER) {
                pr_debug("PM: free some memory\n");
                shrink_all_memory(FREE_PAGE_NUMBER - free_pages);
                if (nr_free_pages() < FREE_PAGE_NUMBER) {
                        error = -ENOMEM;
                        printk(KERN_ERR "PM: No enough memory\n");
-                       goto Thaw;
                }
        }
-
-       if (pm_ops->set_target) {
-               error = pm_ops->set_target(state);
-               if (error)
-                       goto Thaw;
-       }
-       suspend_console();
-       error = device_suspend(PMSG_SUSPEND);
-       if (error) {
-               printk(KERN_ERR "Some devices failed to suspend\n");
-               goto Resume_console;
-       }
-       if (pm_ops->prepare) {
-               if ((error = pm_ops->prepare(state)))
-                       goto Resume_devices;
-       }
-
-       error = disable_nonboot_cpus();
        if (!error)
                return 0;
 
-       enable_nonboot_cpus();
-       pm_finish(state);
- Resume_devices:
-       device_resume();
- Resume_console:
-       resume_console();
  Thaw:
        thaw_processes();
        pm_restore_console();
@@ -148,7 +119,13 @@ void __attribute__ ((weak)) arch_suspend_enable_irqs(void)
        local_irq_enable();
 }
 
-int suspend_enter(suspend_state_t state)
+/**
+ *     suspend_enter - enter the desired system sleep state.
+ *     @state:         state to enter
+ *
+ *     This function should be called after devices have been suspended.
+ */
+static int suspend_enter(suspend_state_t state)
 {
        int error = 0;
 
@@ -159,7 +136,7 @@ int suspend_enter(suspend_state_t state)
                printk(KERN_ERR "Some devices failed to power down\n");
                goto Done;
        }
-       error = pm_ops->enter(state);
+       error = suspend_ops->enter(state);
        device_power_up();
  Done:
        arch_suspend_enable_irqs();
@@ -167,21 +144,56 @@ int suspend_enter(suspend_state_t state)
        return error;
 }
 
+/**
+ *     suspend_devices_and_enter - suspend devices and enter the desired system sleep
+ *                       state.
+ *     @state:           state to enter
+ */
+int suspend_devices_and_enter(suspend_state_t state)
+{
+       int error;
+
+       if (!suspend_ops)
+               return -ENOSYS;
+
+       if (suspend_ops->set_target) {
+               error = suspend_ops->set_target(state);
+               if (error)
+                       return error;
+       }
+       suspend_console();
+       error = device_suspend(PMSG_SUSPEND);
+       if (error) {
+               printk(KERN_ERR "Some devices failed to suspend\n");
+               goto Resume_console;
+       }
+       if (suspend_ops->prepare) {
+               error = suspend_ops->prepare();
+               if (error)
+                       goto Resume_devices;
+       }
+       error = disable_nonboot_cpus();
+       if (!error)
+               suspend_enter(state);
+
+       enable_nonboot_cpus();
+       if (suspend_ops->finish)
+               suspend_ops->finish();
+ Resume_devices:
+       device_resume();
+ Resume_console:
+       resume_console();
+       return error;
+}
 
 /**
  *     suspend_finish - Do final work before exiting suspend sequence.
- *     @state:         State we're coming out of.
  *
  *     Call platform code to clean up, restart processes, and free the 
  *     console that we've allocated. This is not called for suspend-to-disk.
  */
-
-static void suspend_finish(suspend_state_t state)
+static void suspend_finish(void)
 {
-       enable_nonboot_cpus();
-       pm_finish(state);
-       device_resume();
-       resume_console();
        thaw_processes();
        pm_restore_console();
        pm_notifier_call_chain(PM_POST_SUSPEND);
@@ -200,7 +212,7 @@ static inline int valid_state(suspend_state_t state)
        /* All states need lowlevel support and need to be valid
         * to the lowlevel implementation, no valid callback
         * implies that none are valid. */
-       if (!pm_ops || !pm_ops->valid || !pm_ops->valid(state))
+       if (!suspend_ops || !suspend_ops->valid || !suspend_ops->valid(state))
                return 0;
        return 1;
 }
@@ -216,25 +228,29 @@ static inline int valid_state(suspend_state_t state)
  *     Then, do the setup for suspend, enter the state, and cleaup (after
  *     we've woken up).
  */
-
 static int enter_state(suspend_state_t state)
 {
        int error;
 
        if (!valid_state(state))
                return -ENODEV;
+
        if (!mutex_trylock(&pm_mutex))
                return -EBUSY;
 
+       printk("Syncing filesystems ... ");
+       sys_sync();
+       printk("done.\n");
+
        pr_debug("PM: Preparing system for %s sleep\n", pm_states[state]);
-       if ((error = suspend_prepare(state)))
+       if ((error = suspend_prepare()))
                goto Unlock;
 
        pr_debug("PM: Entering %s sleep\n", pm_states[state]);
-       error = suspend_enter(state);
+       error = suspend_devices_and_enter(state);
 
        pr_debug("PM: Finishing wakeup.\n");
-       suspend_finish(state);
+       suspend_finish();
  Unlock:
        mutex_unlock(&pm_mutex);
        return error;
@@ -258,8 +274,9 @@ int pm_suspend(suspend_state_t state)
 
 EXPORT_SYMBOL(pm_suspend);
 
-decl_subsys(power,NULL,NULL);
+#endif /* CONFIG_SUSPEND */
 
+struct kset *power_kset;
 
 /**
  *     state - control system power state.
@@ -272,16 +289,19 @@ decl_subsys(power,NULL,NULL);
  *     proper enumerated value, and initiates a suspend transition.
  */
 
-static ssize_t state_show(struct kset *kset, char *buf)
+static ssize_t state_show(struct kobject *kobj, struct kobj_attribute *attr,
+                         char *buf)
 {
+       char *s = buf;
+#ifdef CONFIG_SUSPEND
        int i;
-       char * s = buf;
 
        for (i = 0; i < PM_SUSPEND_MAX; i++) {
                if (pm_states[i] && valid_state(i))
                        s += sprintf(s,"%s ", pm_states[i]);
        }
-#ifdef CONFIG_SOFTWARE_SUSPEND
+#endif
+#ifdef CONFIG_HIBERNATION
        s += sprintf(s, "%s\n", "disk");
 #else
        if (s != buf)
@@ -291,13 +311,16 @@ static ssize_t state_show(struct kset *kset, char *buf)
        return (s - buf);
 }
 
-static ssize_t state_store(struct kset *kset, const char *buf, size_t n)
+static ssize_t state_store(struct kobject *kobj, struct kobj_attribute *attr,
+                          const char *buf, size_t n)
 {
+#ifdef CONFIG_SUSPEND
        suspend_state_t state = PM_SUSPEND_STANDBY;
        const char * const *s;
+#endif
        char *p;
-       int error;
        int len;
+       int error = -EINVAL;
 
        p = memchr(buf, '\n', n);
        len = p ? p - buf : n;
@@ -305,17 +328,19 @@ static ssize_t state_store(struct kset *kset, const char *buf, size_t n)
        /* First, check if we are requested to hibernate */
        if (len == 4 && !strncmp(buf, "disk", len)) {
                error = hibernate();
-               return error ? error : n;
+  goto Exit;
        }
 
+#ifdef CONFIG_SUSPEND
        for (s = &pm_states[state]; state < PM_SUSPEND_MAX; s++, state++) {
                if (*s && len == strlen(*s) && !strncmp(buf, *s, len))
                        break;
        }
        if (state < PM_SUSPEND_MAX && *s)
                error = enter_state(state);
-       else
-               error = -EINVAL;
+#endif
+
+ Exit:
        return error ? error : n;
 }
 
@@ -324,13 +349,15 @@ power_attr(state);
 #ifdef CONFIG_PM_TRACE
 int pm_trace_enabled;
 
-static ssize_t pm_trace_show(struct kset *kset, char *buf)
+static ssize_t pm_trace_show(struct kobject *kobj, struct kobj_attribute *attr,
+                            char *buf)
 {
        return sprintf(buf, "%d\n", pm_trace_enabled);
 }
 
 static ssize_t
-pm_trace_store(struct kset *kset, const char *buf, size_t n)
+pm_trace_store(struct kobject *kobj, struct kobj_attribute *attr,
+              const char *buf, size_t n)
 {
        int val;
 
@@ -362,10 +389,10 @@ static struct attribute_group attr_group = {
 
 static int __init pm_init(void)
 {
-       int error = subsystem_register(&power_subsys);
-       if (!error)
-               error = sysfs_create_group(&power_subsys.kobj,&attr_group);
-       return error;
+       power_kset = kset_create_and_add("power", NULL, NULL);
+       if (!power_kset)
+               return -ENOMEM;
+       return sysfs_create_group(&power_kset->kobj, &attr_group);
 }
 
 core_initcall(pm_init);