1 files changed, 79 insertions, 54 deletions

diff --git a/drivers/base/power/power.h b/drivers/base/power/power.h
index fb3d35a9e10..a21223d9592 100644
--- a/drivers/base/power/power.h
+++ b/drivers/base/power/power.h
@@ -1,82 +1,107 @@
-/*
- * shutdown.c
- */
+#include <linux/pm_qos.h>
 
-extern void device_shutdown(void);
+static inline void device_pm_init_common(struct device *dev)
+{
+	if (!dev->power.early_init) {
+		spin_lock_init(&dev->power.lock);
+		dev->power.qos = NULL;
+		dev->power.early_init = true;
+	}
+}
 
+#ifdef CONFIG_PM_RUNTIME
 
-#ifdef CONFIG_PM
+static inline void pm_runtime_early_init(struct device *dev)
+{
+	dev->power.disable_depth = 1;
+	device_pm_init_common(dev);
+}
 
-/*
- * main.c
- */
+extern void pm_runtime_init(struct device *dev);
+extern void pm_runtime_remove(struct device *dev);
 
-/*
- * Used to synchronize global power management operations.
- */
-extern struct semaphore dpm_sem;
+#else /* !CONFIG_PM_RUNTIME */
 
-/*
- * Used to serialize changes to the dpm_* lists.
- */
-extern struct semaphore dpm_list_sem;
+static inline void pm_runtime_early_init(struct device *dev)
+{
+	device_pm_init_common(dev);
+}
 
-/*
- * The PM lists.
- */
-extern struct list_head dpm_active;
-extern struct list_head dpm_off;
-extern struct list_head dpm_off_irq;
+static inline void pm_runtime_init(struct device *dev) {}
+static inline void pm_runtime_remove(struct device *dev) {}
 
+#endif /* !CONFIG_PM_RUNTIME */
 
-static inline struct dev_pm_info * to_pm_info(struct list_head * entry)
-{
-	return container_of(entry, struct dev_pm_info, entry);
-}
+#ifdef CONFIG_PM_SLEEP
+
+/* kernel/power/main.c */
+extern int pm_async_enabled;
 
-static inline struct device * to_device(struct list_head * entry)
+/* drivers/base/power/main.c */
+extern struct list_head dpm_list;	/* The active device list */
+
+static inline struct device *to_device(struct list_head *entry)
 {
-	return container_of(to_pm_info(entry), struct device, power);
+	return container_of(entry, struct device, power.entry);
 }
 
-extern int device_pm_add(struct device *);
+extern void device_pm_sleep_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 *);
 
-/*
- * sysfs.c
- */
+#else /* !CONFIG_PM_SLEEP */
 
-extern int dpm_sysfs_add(struct device *);
-extern void dpm_sysfs_remove(struct device *);
+static inline void device_pm_sleep_init(struct device *dev) {}
 
-/*
- * resume.c
- */
+static inline void device_pm_add(struct device *dev) {}
 
-extern void dpm_resume(void);
-extern void dpm_power_up(void);
-extern int resume_device(struct device *);
+static inline void device_pm_remove(struct device *dev)
+{
+	pm_runtime_remove(dev);
+}
 
-/*
- * suspend.c
- */
-extern int suspend_device(struct device *, pm_message_t);
+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 */
 
+static inline void device_pm_init(struct device *dev)
+{
+	device_pm_init_common(dev);
+	device_pm_sleep_init(dev);
+	pm_runtime_init(dev);
+}
+
+#ifdef CONFIG_PM
 
 /*
- * runtime.c
+ * sysfs.c
  */
 
-#else /* CONFIG_PM */
-
+extern int dpm_sysfs_add(struct device *dev);
+extern void dpm_sysfs_remove(struct device *dev);
+extern void rpm_sysfs_remove(struct device *dev);
+extern int wakeup_sysfs_add(struct device *dev);
+extern void wakeup_sysfs_remove(struct device *dev);
+extern int pm_qos_sysfs_add_resume_latency(struct device *dev);
+extern void pm_qos_sysfs_remove_resume_latency(struct device *dev);
+extern int pm_qos_sysfs_add_flags(struct device *dev);
+extern void pm_qos_sysfs_remove_flags(struct device *dev);
 
-static inline int device_pm_add(struct device * dev)
-{
-	return 0;
-}
-static inline void device_pm_remove(struct device * dev)
-{
+#else /* CONFIG_PM */
 
-}
+static inline int dpm_sysfs_add(struct device *dev) { return 0; }
+static inline void dpm_sysfs_remove(struct device *dev) {}
+static inline void rpm_sysfs_remove(struct device *dev) {}
+static inline int wakeup_sysfs_add(struct device *dev) { return 0; }
+static inline void wakeup_sysfs_remove(struct device *dev) {}
+static inline int pm_qos_sysfs_add(struct device *dev) { return 0; }
+static inline void pm_qos_sysfs_remove(struct device *dev) {}
 
 #endif