Browse Source

PM: Export device_pm_schedule_removal

Move the declaration of device_pm_schedule_removal() to device.h
and make it exported, as it will be used directly by some drivers
for unregistering device objects during suspend/resume cycles in a
safe way.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Rafael J. Wysocki 17 years ago
parent
commit
9617c3e460
3 changed files with 7 additions and 1 deletions
  1. 1 0
      drivers/base/power/main.c
  2. 0 1
      drivers/base/power/power.h
  3. 6 0
      include/linux/device.h

+ 1 - 0
drivers/base/power/main.c

@@ -129,6 +129,7 @@ void device_pm_schedule_removal(struct device *dev)
 	list_move_tail(&dev->power.entry, &dpm_destroy);
 	list_move_tail(&dev->power.entry, &dpm_destroy);
 	mutex_unlock(&dpm_list_mtx);
 	mutex_unlock(&dpm_list_mtx);
 }
 }
+EXPORT_SYMBOL_GPL(device_pm_schedule_removal);
 
 
 /**
 /**
  *	pm_sleep_lock - mutual exclusion for registration and suspend
  *	pm_sleep_lock - mutual exclusion for registration and suspend

+ 0 - 1
drivers/base/power/power.h

@@ -13,7 +13,6 @@ static inline struct device *to_device(struct list_head *entry)
 
 
 extern void device_pm_add(struct device *);
 extern void device_pm_add(struct device *);
 extern void device_pm_remove(struct device *);
 extern void device_pm_remove(struct device *);
-extern void device_pm_schedule_removal(struct device *);
 extern int pm_sleep_lock(void);
 extern int pm_sleep_lock(void);
 extern void pm_sleep_unlock(void);
 extern void pm_sleep_unlock(void);
 
 

+ 6 - 0
include/linux/device.h

@@ -534,11 +534,17 @@ extern struct device *device_create(struct class *cls, struct device *parent,
 extern void device_destroy(struct class *cls, dev_t devt);
 extern void device_destroy(struct class *cls, dev_t devt);
 #ifdef CONFIG_PM_SLEEP
 #ifdef CONFIG_PM_SLEEP
 extern void destroy_suspended_device(struct class *cls, dev_t devt);
 extern void destroy_suspended_device(struct class *cls, dev_t devt);
+extern void device_pm_schedule_removal(struct device *);
 #else /* !CONFIG_PM_SLEEP */
 #else /* !CONFIG_PM_SLEEP */
 static inline void destroy_suspended_device(struct class *cls, dev_t devt)
 static inline void destroy_suspended_device(struct class *cls, dev_t devt)
 {
 {
 	device_destroy(cls, devt);
 	device_destroy(cls, devt);
 }
 }
+
+static inline void device_pm_schedule_removal(struct device *dev)
+{
+	device_unregister(dev);
+}
 #endif /* !CONFIG_PM_SLEEP */
 #endif /* !CONFIG_PM_SLEEP */
 
 
 /*
 /*