diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2008-01-25 01:30:25 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-02-02 15:14:48 -0800 |
commit | 9617c3e460bbccb6d9496a1f1e6903eb81f336e9 (patch) | |
tree | b77a19e6b082365c74bf0f1b3ee3909bbbf7f4cc | |
parent | 18bbe0c26ccb7445d19465b0d3585d23445307f1 (diff) | |
download | kernel_samsung_smdk4412-9617c3e460bbccb6d9496a1f1e6903eb81f336e9.zip kernel_samsung_smdk4412-9617c3e460bbccb6d9496a1f1e6903eb81f336e9.tar.gz kernel_samsung_smdk4412-9617c3e460bbccb6d9496a1f1e6903eb81f336e9.tar.bz2 |
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>
-rw-r--r-- | drivers/base/power/main.c | 1 | ||||
-rw-r--r-- | drivers/base/power/power.h | 1 | ||||
-rw-r--r-- | include/linux/device.h | 6 |
3 files changed, 7 insertions, 1 deletions
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index 200ed5f..bdc03f7 100644 --- a/drivers/base/power/main.c +++ b/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); mutex_unlock(&dpm_list_mtx); } +EXPORT_SYMBOL_GPL(device_pm_schedule_removal); /** * pm_sleep_lock - mutual exclusion for registration and suspend diff --git a/drivers/base/power/power.h b/drivers/base/power/power.h index 6f0dfca..e32d3bd 100644 --- a/drivers/base/power/power.h +++ b/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_remove(struct device *); -extern void device_pm_schedule_removal(struct device *); extern int pm_sleep_lock(void); extern void pm_sleep_unlock(void); diff --git a/include/linux/device.h b/include/linux/device.h index db375be..479c0b3 100644 --- a/include/linux/device.h +++ b/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); #ifdef CONFIG_PM_SLEEP extern void destroy_suspended_device(struct class *cls, dev_t devt); +extern void device_pm_schedule_removal(struct device *); #else /* !CONFIG_PM_SLEEP */ static inline void destroy_suspended_device(struct class *cls, dev_t devt) { device_destroy(cls, devt); } + +static inline void device_pm_schedule_removal(struct device *dev) +{ + device_unregister(dev); +} #endif /* !CONFIG_PM_SLEEP */ /* |