diff options
Diffstat (limited to 'drivers/base/bus.c')
-rw-r--r-- | drivers/base/bus.c | 6 |
1 files changed, 3 insertions, 3 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) |