PM: Handle device registrations during suspend/resume

[karo-tx-linux.git] / drivers / base / power / power.h

diff --git a/drivers/base/power/power.h b/drivers/base/power/power.h
index 8ba0830cbc03fa6fe50d8bc27be7b5c3e770259c..a6894f2a4b9960d1a19094fa8b4b7890b9bd0e6d 100644 (file)
--- a/drivers/base/power/power.h
+++ b/drivers/base/power/power.h
@@ -1,77 +1,44 @@
-/*
- * shutdown.c
- */
-
-extern void device_shutdown(void);
-
-
 #ifdef CONFIG_PM_SLEEP
 
 /*
  * main.c
  */
 
-/*
- * Used to synchronize global power management operations.
- */
-extern struct mutex dpm_mtx;
-
-/*
- * Used to serialize changes to the dpm_* lists.
- */
-extern struct mutex dpm_list_mtx;
-
-/*
- * The PM lists.
- */
-extern struct list_head dpm_active;
-extern struct list_head dpm_off;
-extern struct list_head dpm_off_irq;
-
-
-static inline struct dev_pm_info * to_pm_info(struct list_head * entry)
-{
-       return container_of(entry, struct dev_pm_info, entry);
-}
+extern struct list_head dpm_active;    /* The active device list */
 
-static inline struct device * to_device(struct list_head * entry)
+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_remove(struct device *);
 
-/*
- * sysfs.c
- */
+#else /* CONFIG_PM_SLEEP */
 
-extern int dpm_sysfs_add(struct device *);
-extern void dpm_sysfs_remove(struct device *);
+static inline int device_pm_add(struct device *dev) { return 0; }
+static inline void device_pm_remove(struct device *dev) {}
 
-/*
- * resume.c
- */
+#endif
 
-extern void dpm_resume(void);
-extern void dpm_power_up(void);
-extern int resume_device(struct device *);
+#ifdef CONFIG_PM
 
 /*
- * suspend.c
+ * sysfs.c
  */
-extern int suspend_device(struct device *, pm_message_t);
 
-#else /* CONFIG_PM_SLEEP */
+extern int dpm_sysfs_add(struct device *);
+extern void dpm_sysfs_remove(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 void dpm_sysfs_remove(struct device *dev)
+{
 }
 
 #endif