diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2007-11-06 18:03:30 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-01-24 23:40:24 -0500 |
commit | 2fb9113b974c3c7c43e76647bd5077238e274e1c (patch) | |
tree | b87912c7d2c7a24b35a9a5e82fe462d7cffcbacb | |
parent | 0ff21e46630abce11fdaaffabd72bbd4eed5ac2c (diff) |
kobject: remove subsystem_(un)register functions
These functions are no longer used and are the last remants of the old
subsystem crap. So delete them for good.
Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/base/bus.c | 6 | ||||
-rw-r--r-- | drivers/base/class.c | 4 | ||||
-rw-r--r-- | include/linux/kobject.h | 3 | ||||
-rw-r--r-- | lib/kobject.c | 13 |
4 files changed, 5 insertions, 21 deletions
diff --git a/drivers/base/bus.c b/drivers/base/bus.c index 6796d3e46053..871607b7c876 100644 --- a/drivers/base/bus.c +++ b/drivers/base/bus.c | |||
@@ -854,7 +854,7 @@ int bus_register(struct bus_type * bus) | |||
854 | bus->subsys.kobj.kset = bus_kset; | 854 | bus->subsys.kobj.kset = bus_kset; |
855 | bus->subsys.kobj.ktype = &bus_ktype; | 855 | bus->subsys.kobj.ktype = &bus_ktype; |
856 | 856 | ||
857 | retval = subsystem_register(&bus->subsys); | 857 | retval = kset_register(&bus->subsys); |
858 | if (retval) | 858 | if (retval) |
859 | goto out; | 859 | goto out; |
860 | 860 | ||
@@ -900,7 +900,7 @@ bus_drivers_fail: | |||
900 | bus_devices_fail: | 900 | bus_devices_fail: |
901 | bus_remove_file(bus, &bus_attr_uevent); | 901 | bus_remove_file(bus, &bus_attr_uevent); |
902 | bus_uevent_fail: | 902 | bus_uevent_fail: |
903 | subsystem_unregister(&bus->subsys); | 903 | kset_unregister(&bus->subsys); |
904 | out: | 904 | out: |
905 | return retval; | 905 | return retval; |
906 | } | 906 | } |
@@ -920,7 +920,7 @@ void bus_unregister(struct bus_type * bus) | |||
920 | kset_unregister(bus->drivers_kset); | 920 | kset_unregister(bus->drivers_kset); |
921 | kset_unregister(bus->devices_kset); | 921 | kset_unregister(bus->devices_kset); |
922 | bus_remove_file(bus, &bus_attr_uevent); | 922 | bus_remove_file(bus, &bus_attr_uevent); |
923 | subsystem_unregister(&bus->subsys); | 923 | kset_unregister(&bus->subsys); |
924 | } | 924 | } |
925 | 925 | ||
926 | int bus_register_notifier(struct bus_type *bus, struct notifier_block *nb) | 926 | int bus_register_notifier(struct bus_type *bus, struct notifier_block *nb) |
diff --git a/drivers/base/class.c b/drivers/base/class.c index 304f90eb9b00..3ffcda753e78 100644 --- a/drivers/base/class.c +++ b/drivers/base/class.c | |||
@@ -152,7 +152,7 @@ int class_register(struct class * cls) | |||
152 | cls->subsys.kobj.kset = class_kset; | 152 | cls->subsys.kobj.kset = class_kset; |
153 | cls->subsys.kobj.ktype = &class_ktype; | 153 | cls->subsys.kobj.ktype = &class_ktype; |
154 | 154 | ||
155 | error = subsystem_register(&cls->subsys); | 155 | error = kset_register(&cls->subsys); |
156 | if (!error) { | 156 | if (!error) { |
157 | error = add_class_attrs(class_get(cls)); | 157 | error = add_class_attrs(class_get(cls)); |
158 | class_put(cls); | 158 | class_put(cls); |
@@ -164,7 +164,7 @@ void class_unregister(struct class * cls) | |||
164 | { | 164 | { |
165 | pr_debug("device class '%s': unregistering\n", cls->name); | 165 | pr_debug("device class '%s': unregistering\n", cls->name); |
166 | remove_class_attrs(cls); | 166 | remove_class_attrs(cls); |
167 | subsystem_unregister(&cls->subsys); | 167 | kset_unregister(&cls->subsys); |
168 | } | 168 | } |
169 | 169 | ||
170 | static void class_create_release(struct class *cls) | 170 | static void class_create_release(struct class *cls) |
diff --git a/include/linux/kobject.h b/include/linux/kobject.h index 0930efdcc094..78c851b4e67e 100644 --- a/include/linux/kobject.h +++ b/include/linux/kobject.h | |||
@@ -207,9 +207,6 @@ extern struct kset *power_kset; | |||
207 | /* The global /sys/firmware/ kobject for people to chain off of */ | 207 | /* The global /sys/firmware/ kobject for people to chain off of */ |
208 | extern struct kobject *firmware_kobj; | 208 | extern struct kobject *firmware_kobj; |
209 | 209 | ||
210 | extern int __must_check subsystem_register(struct kset *); | ||
211 | extern void subsystem_unregister(struct kset *); | ||
212 | |||
213 | #if defined(CONFIG_HOTPLUG) | 210 | #if defined(CONFIG_HOTPLUG) |
214 | int kobject_uevent(struct kobject *kobj, enum kobject_action action); | 211 | int kobject_uevent(struct kobject *kobj, enum kobject_action action); |
215 | int kobject_uevent_env(struct kobject *kobj, enum kobject_action action, | 212 | int kobject_uevent_env(struct kobject *kobj, enum kobject_action action, |
diff --git a/lib/kobject.c b/lib/kobject.c index c742ac25228a..7919c32a3a15 100644 --- a/lib/kobject.c +++ b/lib/kobject.c | |||
@@ -800,16 +800,6 @@ struct kobject * kset_find_obj(struct kset * kset, const char * name) | |||
800 | return ret; | 800 | return ret; |
801 | } | 801 | } |
802 | 802 | ||
803 | int subsystem_register(struct kset *s) | ||
804 | { | ||
805 | return kset_register(s); | ||
806 | } | ||
807 | |||
808 | void subsystem_unregister(struct kset *s) | ||
809 | { | ||
810 | kset_unregister(s); | ||
811 | } | ||
812 | |||
813 | static void kset_release(struct kobject *kobj) | 803 | static void kset_release(struct kobject *kobj) |
814 | { | 804 | { |
815 | struct kset *kset = container_of(kobj, struct kset, kobj); | 805 | struct kset *kset = container_of(kobj, struct kset, kobj); |
@@ -904,6 +894,3 @@ EXPORT_SYMBOL(kobject_del); | |||
904 | 894 | ||
905 | EXPORT_SYMBOL(kset_register); | 895 | EXPORT_SYMBOL(kset_register); |
906 | EXPORT_SYMBOL(kset_unregister); | 896 | EXPORT_SYMBOL(kset_unregister); |
907 | |||
908 | EXPORT_SYMBOL(subsystem_register); | ||
909 | EXPORT_SYMBOL(subsystem_unregister); | ||