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 e32d3bd..b8fa1aa 100644 (file)
--- a/drivers/base/power/power.h
+++ b/drivers/base/power/power.h
@@ -1,42 +1,55 @@
+#ifdef CONFIG_PM_RUNTIME
+
+extern void pm_runtime_init(struct device *dev);
+extern void pm_runtime_remove(struct device *dev);
+
+#else /* !CONFIG_PM_RUNTIME */
+
+static inline void pm_runtime_init(struct device *dev) {}
+static inline void pm_runtime_remove(struct device *dev) {}
+
+#endif /* !CONFIG_PM_RUNTIME */
+
 #ifdef CONFIG_PM_SLEEP
 
 /*
  * main.c
  */
 
-extern struct list_head dpm_active;    /* The active device list */
+extern struct list_head dpm_list;      /* The active device list */
 
 static inline struct device *to_device(struct list_head *entry)
 {
        return container_of(entry, struct device, power.entry);
 }
 
+extern void device_pm_init(struct device *dev);
 extern void device_pm_add(struct device *);
 extern void device_pm_remove(struct device *);
-extern int pm_sleep_lock(void);
-extern void pm_sleep_unlock(void);
-
-#else /* CONFIG_PM_SLEEP */
+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 void device_pm_add(struct device *dev)
+static inline void device_pm_init(struct device *dev)
 {
+       pm_runtime_init(dev);
 }
 
 static inline void device_pm_remove(struct device *dev)
 {
+       pm_runtime_remove(dev);
 }
 
-static inline int pm_sleep_lock(void)
-{
-       return 0;
-}
-
-static inline void pm_sleep_unlock(void)
-{
-}
+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
+#endif /* !CONFIG_PM_SLEEP */
 
 #ifdef CONFIG_PM