kobject: remove subsystem_(un)register functions

[linux-2.6-omap-h63xx.git] / drivers / base / bus.c

diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index 6796d3e46053bb4ef639863c982cee030ea54511..871607b7c876ce67d78ca31f0477d8d1356bf67d 100644 (file)
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -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)