PM: Introduce core framework for run-time PM of I/O devices (rev. 17)

[safe/jmp/linux-2.6] / drivers / base / power / power.h

diff --git a/drivers/base/power/power.h b/drivers/base/power/power.h
index e5eda74..b8fa1aa 100644 (file)
--- a/drivers/base/power/power.h
+++ b/drivers/base/power/power.h
@@ -1,57 +1,57 @@
+#ifdef CONFIG_PM_RUNTIME
 
+extern void pm_runtime_init(struct device *dev);
+extern void pm_runtime_remove(struct device *dev);
 
-enum {
-       DEVICE_PM_ON,
-       DEVICE_PM1,
-       DEVICE_PM2,
-       DEVICE_PM3,
-       DEVICE_PM_OFF,
-};
+#else /* !CONFIG_PM_RUNTIME */
 
-/*
- * shutdown.c
- */
+static inline void pm_runtime_init(struct device *dev) {}
+static inline void pm_runtime_remove(struct device *dev) {}
 
-extern int device_detach_shutdown(struct device *);
-extern void device_shutdown(void);
+#endif /* !CONFIG_PM_RUNTIME */
 
-
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 
 /*
  * main.c
  */
 
-/*
- * Used to synchronize global power management operations.
- */
-extern struct semaphore dpm_sem;
+extern struct list_head dpm_list;      /* The active device list */
 
-/*
- * Used to serialize changes to the dpm_* lists.
- */
-extern struct semaphore dpm_list_sem;
+static inline struct device *to_device(struct list_head *entry)
+{
+       return container_of(entry, struct device, power.entry);
+}
 
-/*
- * The PM lists.
- */
-extern struct list_head dpm_active;
-extern struct list_head dpm_off;
-extern struct list_head dpm_off_irq;
+extern void device_pm_init(struct device *dev);
+extern void device_pm_add(struct device *);
+extern void device_pm_remove(struct device *);
+extern void device_pm_move_before(struct device *, struct device *);
+extern void device_pm_move_after(struct device *, struct device *);
+extern void device_pm_move_last(struct device *);
 
+#else /* !CONFIG_PM_SLEEP */
 
-static inline struct dev_pm_info * to_pm_info(struct list_head * entry)
+static inline void device_pm_init(struct device *dev)
 {
-       return container_of(entry, struct dev_pm_info, entry);
+       pm_runtime_init(dev);
 }
 
-static inline struct device * to_device(struct list_head * entry)
+static inline void device_pm_remove(struct device *dev)
 {
-       return container_of(to_pm_info(entry), struct device, power);
+       pm_runtime_remove(dev);
 }
 
-extern int device_pm_add(struct device *);
-extern void device_pm_remove(struct device *);
+static inline void device_pm_add(struct device *dev) {}
+static inline void device_pm_move_before(struct device *deva,
+                                        struct device *devb) {}
+static inline void device_pm_move_after(struct device *deva,
+                                       struct device *devb) {}
+static inline void device_pm_move_last(struct device *dev) {}
+
+#endif /* !CONFIG_PM_SLEEP */
+
+#ifdef CONFIG_PM
 
 /*
  * sysfs.c
@@ -60,47 +60,15 @@ extern void device_pm_remove(struct device *);
 extern int dpm_sysfs_add(struct device *);
 extern void dpm_sysfs_remove(struct device *);
 
-/*
- * resume.c
- */
-
-extern void dpm_resume(void);
-extern void dpm_power_up(void);
-extern int resume_device(struct device *);
-
-/*
- * suspend.c
- */
-extern int suspend_device(struct device *, pm_message_t);
-
-
-/*
- * runtime.c
- */
-
-extern int dpm_runtime_suspend(struct device *, pm_message_t);
-extern void dpm_runtime_resume(struct device *);
-
 #else /* CONFIG_PM */
 
-
-static inline int device_pm_add(struct device * dev)
+static inline int dpm_sysfs_add(struct device *dev)
 {
        return 0;
 }
-static inline void device_pm_remove(struct device * dev)
-{
 
-}
-
-static inline int dpm_runtime_suspend(struct device * dev, pm_message_t state)
+static inline void dpm_sysfs_remove(struct device *dev)
 {
-       return 0;
-}
-
-static inline void dpm_runtime_resume(struct device * dev)
-{
-
 }
 
 #endif