aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2014-01-10 08:57:31 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-01-10 19:03:19 -0500
commitd1ba277e79889085a2faec3b68b91ce89c63f888 (patch)
treedab78fe1f72bbbbf46e3398aec1066d49263d8b7 /include/linux
parentbdbb0a1376635d80e096f6433595a38984cf5408 (diff)
sysfs, driver-core: remove unused {sysfs|device}_schedule_callback_owner()
All device_schedule_callback_owner() users are converted to use device_remove_file_self(). Remove now unused {sysfs|device}_schedule_callback_owner(). Signed-off-by: Tejun Heo <tj@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/device.h11
-rw-r--r--include/linux/sysfs.h9
2 files changed, 1 insertions, 19 deletions
diff --git a/include/linux/device.h b/include/linux/device.h
index 1ff3f1697513..fb1ba13f7665 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -566,12 +566,6 @@ extern int __must_check device_create_bin_file(struct device *dev,
566 const struct bin_attribute *attr); 566 const struct bin_attribute *attr);
567extern void device_remove_bin_file(struct device *dev, 567extern void device_remove_bin_file(struct device *dev,
568 const struct bin_attribute *attr); 568 const struct bin_attribute *attr);
569extern int device_schedule_callback_owner(struct device *dev,
570 void (*func)(struct device *dev), struct module *owner);
571
572/* This is a macro to avoid include problems with THIS_MODULE */
573#define device_schedule_callback(dev, func) \
574 device_schedule_callback_owner(dev, func, THIS_MODULE)
575 569
576/* device resource management */ 570/* device resource management */
577typedef void (*dr_release_t)(struct device *dev, void *res); 571typedef void (*dr_release_t)(struct device *dev, void *res);
@@ -931,10 +925,7 @@ extern int device_online(struct device *dev);
931extern struct device *__root_device_register(const char *name, 925extern struct device *__root_device_register(const char *name,
932 struct module *owner); 926 struct module *owner);
933 927
934/* 928/* This is a macro to avoid include problems with THIS_MODULE */
935 * This is a macro to avoid include problems with THIS_MODULE,
936 * just as per what is done for device_schedule_callback() above.
937 */
938#define root_device_register(name) \ 929#define root_device_register(name) \
939 __root_device_register(name, THIS_MODULE) 930 __root_device_register(name, THIS_MODULE)
940 931
diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
index bd96c603ab6c..14df05415af9 100644
--- a/include/linux/sysfs.h
+++ b/include/linux/sysfs.h
@@ -178,9 +178,6 @@ struct sysfs_ops {
178 178
179#ifdef CONFIG_SYSFS 179#ifdef CONFIG_SYSFS
180 180
181int sysfs_schedule_callback(struct kobject *kobj, void (*func)(void *),
182 void *data, struct module *owner);
183
184int __must_check sysfs_create_dir_ns(struct kobject *kobj, const void *ns); 181int __must_check sysfs_create_dir_ns(struct kobject *kobj, const void *ns);
185void sysfs_remove_dir(struct kobject *kobj); 182void sysfs_remove_dir(struct kobject *kobj);
186int __must_check sysfs_rename_dir_ns(struct kobject *kobj, const char *new_name, 183int __must_check sysfs_rename_dir_ns(struct kobject *kobj, const char *new_name,
@@ -249,12 +246,6 @@ int __must_check sysfs_init(void);
249 246
250#else /* CONFIG_SYSFS */ 247#else /* CONFIG_SYSFS */
251 248
252static inline int sysfs_schedule_callback(struct kobject *kobj,
253 void (*func)(void *), void *data, struct module *owner)
254{
255 return -ENOSYS;
256}
257
258static inline int sysfs_create_dir_ns(struct kobject *kobj, const void *ns) 249static inline int sysfs_create_dir_ns(struct kobject *kobj, const void *ns)
259{ 250{
260 return 0; 251 return 0;