Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6:
Driver core: Remove unneeded get_{device,driver}() calls.
Driver core: Update some prototypes in platform.txt
driver core: convert to use class_find_device api
PM: Export device_pm_schedule_removal
nozomi: finish constification
nozomi: constify driver
nozomi driver update
Add ja_JP translation of stable_kernel_rules.txt
kobject: kerneldoc comment fix
kobject: Always build in kernel/ksysfs.o.
This commit is contained in:
@@ -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 */
|
||||
|
||||
/*
|
||||
|
||||
Reference in New Issue
Block a user