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>
This commit is contained in:
		
							parent
							
								
									0ff21e4663
								
							
						
					
					
						commit
						2fb9113b97
					
				| @ -854,7 +854,7 @@ int bus_register(struct bus_type * bus) | ||||
| 	bus->subsys.kobj.kset = bus_kset; | ||||
| 	bus->subsys.kobj.ktype = &bus_ktype; | ||||
| 
 | ||||
| 	retval = subsystem_register(&bus->subsys); | ||||
| 	retval = kset_register(&bus->subsys); | ||||
| 	if (retval) | ||||
| 		goto out; | ||||
| 
 | ||||
| @ -900,7 +900,7 @@ bus_drivers_fail: | ||||
| bus_devices_fail: | ||||
| 	bus_remove_file(bus, &bus_attr_uevent); | ||||
| bus_uevent_fail: | ||||
| 	subsystem_unregister(&bus->subsys); | ||||
| 	kset_unregister(&bus->subsys); | ||||
| out: | ||||
| 	return retval; | ||||
| } | ||||
| @ -920,7 +920,7 @@ void bus_unregister(struct bus_type * bus) | ||||
| 	kset_unregister(bus->drivers_kset); | ||||
| 	kset_unregister(bus->devices_kset); | ||||
| 	bus_remove_file(bus, &bus_attr_uevent); | ||||
| 	subsystem_unregister(&bus->subsys); | ||||
| 	kset_unregister(&bus->subsys); | ||||
| } | ||||
| 
 | ||||
| int bus_register_notifier(struct bus_type *bus, struct notifier_block *nb) | ||||
|  | ||||
| @ -152,7 +152,7 @@ int class_register(struct class * cls) | ||||
| 	cls->subsys.kobj.kset = class_kset; | ||||
| 	cls->subsys.kobj.ktype = &class_ktype; | ||||
| 
 | ||||
| 	error = subsystem_register(&cls->subsys); | ||||
| 	error = kset_register(&cls->subsys); | ||||
| 	if (!error) { | ||||
| 		error = add_class_attrs(class_get(cls)); | ||||
| 		class_put(cls); | ||||
| @ -164,7 +164,7 @@ void class_unregister(struct class * cls) | ||||
| { | ||||
| 	pr_debug("device class '%s': unregistering\n", cls->name); | ||||
| 	remove_class_attrs(cls); | ||||
| 	subsystem_unregister(&cls->subsys); | ||||
| 	kset_unregister(&cls->subsys); | ||||
| } | ||||
| 
 | ||||
| static void class_create_release(struct class *cls) | ||||
|  | ||||
| @ -207,9 +207,6 @@ extern struct kset *power_kset; | ||||
| /* The global /sys/firmware/ kobject for people to chain off of */ | ||||
| extern struct kobject *firmware_kobj; | ||||
| 
 | ||||
| extern int __must_check subsystem_register(struct kset *); | ||||
| extern void subsystem_unregister(struct kset *); | ||||
| 
 | ||||
| #if defined(CONFIG_HOTPLUG) | ||||
| int kobject_uevent(struct kobject *kobj, enum kobject_action action); | ||||
| int kobject_uevent_env(struct kobject *kobj, enum kobject_action action, | ||||
|  | ||||
| @ -800,16 +800,6 @@ struct kobject * kset_find_obj(struct kset * kset, const char * name) | ||||
| 	return ret; | ||||
| } | ||||
| 
 | ||||
| int subsystem_register(struct kset *s) | ||||
| { | ||||
| 	return kset_register(s); | ||||
| } | ||||
| 
 | ||||
| void subsystem_unregister(struct kset *s) | ||||
| { | ||||
| 	kset_unregister(s); | ||||
| } | ||||
| 
 | ||||
| static void kset_release(struct kobject *kobj) | ||||
| { | ||||
| 	struct kset *kset = container_of(kobj, struct kset, kobj); | ||||
| @ -904,6 +894,3 @@ EXPORT_SYMBOL(kobject_del); | ||||
| 
 | ||||
| EXPORT_SYMBOL(kset_register); | ||||
| EXPORT_SYMBOL(kset_unregister); | ||||
| 
 | ||||
| EXPORT_SYMBOL(subsystem_register); | ||||
| EXPORT_SYMBOL(subsystem_unregister); | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user