driver core: Introduce default attribute groups.

[safe/jmp/linux-2.6] / drivers / base / driver.c

diff --git a/drivers/base/driver.c b/drivers/base/driver.c
index 1214cbd..e3b5840 100644 (file)
--- a/drivers/base/driver.c
+++ b/drivers/base/driver.c
@@ -142,6 +142,37 @@ void put_driver(struct device_driver * drv)
        kobject_put(&drv->kobj);
 }
 
+static int driver_add_groups(struct device_driver *drv,
+                            struct attribute_group **groups)
+{
+       int error = 0;
+       int i;
+
+       if (groups) {
+               for (i = 0; groups[i]; i++) {
+                       error = sysfs_create_group(&drv->kobj, groups[i]);
+                       if (error) {
+                               while (--i >= 0)
+                                       sysfs_remove_group(&drv->kobj,
+                                                          groups[i]);
+                               break;
+                       }
+               }
+       }
+       return error;
+}
+
+static void driver_remove_groups(struct device_driver *drv,
+                                struct attribute_group **groups)
+{
+       int i;
+
+       if (groups)
+               for (i = 0; groups[i]; i++)
+                       sysfs_remove_group(&drv->kobj, groups[i]);
+}
+
+
 /**
  *     driver_register - register driver with bus
  *     @drv:   driver to register
@@ -149,41 +180,37 @@ void put_driver(struct device_driver * drv)
  *     We pass off most of the work to the bus_add_driver() call,
  *     since most of the things we have to do deal with the bus
  *     structures.
- *
- *     The one interesting aspect is that we setup @drv->unloaded
- *     as a completion that gets complete when the driver reference
- *     count reaches 0.
  */
 int driver_register(struct device_driver * drv)
 {
+       int ret;
+
        if ((drv->bus->probe && drv->probe) ||
            (drv->bus->remove && drv->remove) ||
            (drv->bus->shutdown && drv->shutdown)) {
                printk(KERN_WARNING "Driver '%s' needs updating - please use bus_type methods\n", drv->name);
        }
        klist_init(&drv->klist_devices, NULL, NULL);
-       init_completion(&drv->unloaded);
-       return bus_add_driver(drv);
+       ret = bus_add_driver(drv);
+       if (ret)
+               return ret;
+       ret = driver_add_groups(drv, drv->groups);
+       if (ret)
+               bus_remove_driver(drv);
+       return ret;
 }
 
-
 /**
  *     driver_unregister - remove driver from system.
  *     @drv:   driver.
  *
  *     Again, we pass off most of the work to the bus-level call.
- *
- *     Though, once that is done, we wait until @drv->unloaded is completed.
- *     This will block until the driver refcount reaches 0, and it is
- *     released. Only modular drivers will call this function, and we
- *     have to guarantee that it won't complete, letting the driver
- *     unload until all references are gone.
  */
 
 void driver_unregister(struct device_driver * drv)
 {
+       driver_remove_groups(drv, drv->groups);
        bus_remove_driver(drv);
-       wait_for_completion(&drv->unloaded);
 }
 
 /**
@@ -198,7 +225,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->p->drivers_kset, name);
        if (k)
                return to_drv(k);
        return NULL;