Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=6dcec2511ff55b4abaca7ad3433011a7c04c2430
Commit:     6dcec2511ff55b4abaca7ad3433011a7c04c2430
Parent:     3d8995963dfec66ef6270e729bf75903e9043f9d
Author:     Greg Kroah-Hartman <[EMAIL PROTECTED]>
AuthorDate: Thu Nov 1 13:31:26 2007 -0700
Committer:  Greg Kroah-Hartman <[EMAIL PROTECTED]>
CommitDate: Thu Jan 24 20:40:16 2008 -0800

    kset: convert struct bus_device->drivers to use kset_create
    
    Dynamically create the kset instead of declaring it statically.
    
    Having 3 static kobjects in one structure is not only foolish, but ripe
    for nasty race conditions if handled improperly.  We also rename the
    field to catch any potential users of it (not that there should be
    outside of the driver core...)
    
    Cc: Kay Sievers <[EMAIL PROTECTED]>
    Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
---
 drivers/base/bus.c     |   15 ++++++++-------
 drivers/base/driver.c  |    2 +-
 include/linux/device.h |    2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index b23eeb2..6796d3e 100644
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -638,7 +638,7 @@ int bus_add_driver(struct device_driver *drv)
        error = kobject_set_name(&drv->kobj, "%s", drv->name);
        if (error)
                goto out_put_bus;
-       drv->kobj.kset = &bus->drivers;
+       drv->kobj.kset = bus->drivers_kset;
        drv->kobj.ktype = &driver_ktype;
        error = kobject_register(&drv->kobj);
        if (error)
@@ -869,11 +869,12 @@ int bus_register(struct bus_type * bus)
                goto bus_devices_fail;
        }
 
-       kobject_set_name(&bus->drivers.kobj, "drivers");
-       bus->drivers.kobj.parent = &bus->subsys.kobj;
-       retval = kset_register(&bus->drivers);
-       if (retval)
+       bus->drivers_kset = kset_create_and_add("drivers", NULL,
+                                               &bus->subsys.kobj);
+       if (!bus->drivers_kset) {
+               retval = -ENOMEM;
                goto bus_drivers_fail;
+       }
 
        klist_init(&bus->klist_devices, klist_devices_get, klist_devices_put);
        klist_init(&bus->klist_drivers, NULL, NULL);
@@ -893,7 +894,7 @@ int bus_register(struct bus_type * bus)
 bus_attrs_fail:
        remove_probe_files(bus);
 bus_probe_files_fail:
-       kset_unregister(&bus->drivers);
+       kset_unregister(bus->drivers_kset);
 bus_drivers_fail:
        kset_unregister(bus->devices_kset);
 bus_devices_fail:
@@ -916,7 +917,7 @@ void bus_unregister(struct bus_type * bus)
        pr_debug("bus %s: unregistering\n", bus->name);
        bus_remove_attrs(bus);
        remove_probe_files(bus);
-       kset_unregister(&bus->drivers);
+       kset_unregister(bus->drivers_kset);
        kset_unregister(bus->devices_kset);
        bus_remove_file(bus, &bus_attr_uevent);
        subsystem_unregister(&bus->subsys);
diff --git a/drivers/base/driver.c b/drivers/base/driver.c
index eb11475..1c9770d 100644
--- a/drivers/base/driver.c
+++ b/drivers/base/driver.c
@@ -185,7 +185,7 @@ void driver_unregister(struct device_driver * drv)
  */
 struct device_driver *driver_find(const char *name, struct bus_type *bus)
 {
-       struct kobject *k = kset_find_obj(&bus->drivers, name);
+       struct kobject *k = kset_find_obj(bus->drivers_kset, name);
        if (k)
                return to_drv(k);
        return NULL;
diff --git a/include/linux/device.h b/include/linux/device.h
index 82c2777..110ace0 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -54,7 +54,7 @@ struct bus_type {
        struct module           * owner;
 
        struct kset             subsys;
-       struct kset             drivers;
+       struct kset             *drivers_kset;
        struct kset             *devices_kset;
        struct klist            klist_devices;
        struct klist            klist_drivers;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to