1 files changed, 264 insertions, 237 deletions

diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index 9a19b071c573..f484495b2ad1 100644
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -3,6 +3,8 @@
  *
  * Copyright (c) 2002-3 Patrick Mochel
  * Copyright (c) 2002-3 Open Source Development Labs
+ * Copyright (c) 2007 Greg Kroah-Hartman <gregkh@suse.de>
+ * Copyright (c) 2007 Novell Inc.
  *
  * This file is released under the GPLv2
  *
@@ -17,14 +19,13 @@
 #include "power/power.h"
 
 #define to_bus_attr(_attr) container_of(_attr, struct bus_attribute, attr)
-#define to_bus(obj) container_of(obj, struct bus_type, subsys.kobj)
+#define to_bus(obj) container_of(obj, struct bus_type_private, subsys.kobj)
 
 /*
  * sysfs bindings for drivers
  */
 
 #define to_drv_attr(_attr) container_of(_attr, struct driver_attribute, attr)
-#define to_driver(obj) container_of(obj, struct device_driver, kobj)
 
 
 static int __must_check bus_rescan_devices_helper(struct device *dev,
@@ -32,37 +33,40 @@ static int __must_check bus_rescan_devices_helper(struct device *dev,
 
 static struct bus_type *bus_get(struct bus_type *bus)
 {
-        return bus ? container_of(kset_get(&bus->subsys),
-                                struct bus_type, subsys) : NULL;
+        if (bus) {
+                kset_get(&bus->p->subsys);
+                return bus;
+        }
+        return NULL;
 }
 
 static void bus_put(struct bus_type *bus)
 {
-        kset_put(&bus->subsys);
+        if (bus)
+                kset_put(&bus->p->subsys);
 }
 
-static ssize_t
-drv_attr_show(struct kobject * kobj, struct attribute * attr, char * buf)
+static ssize_t drv_attr_show(struct kobject *kobj, struct attribute *attr,
+                             char *buf)
 {
-        struct driver_attribute * drv_attr = to_drv_attr(attr);
-        struct device_driver * drv = to_driver(kobj);
+        struct driver_attribute *drv_attr = to_drv_attr(attr);
+        struct driver_private *drv_priv = to_driver(kobj);
         ssize_t ret = -EIO;
 
         if (drv_attr->show)
-                ret = drv_attr->show(drv, buf);
+                ret = drv_attr->show(drv_priv->driver, buf);
         return ret;
 }
 
-static ssize_t
-drv_attr_store(struct kobject * kobj, struct attribute * attr,
-               const char * buf, size_t count)
+static ssize_t drv_attr_store(struct kobject *kobj, struct attribute *attr,
+                              const char *buf, size_t count)
 {
-        struct driver_attribute * drv_attr = to_drv_attr(attr);
-        struct device_driver * drv = to_driver(kobj);
+        struct driver_attribute *drv_attr = to_drv_attr(attr);
+        struct driver_private *drv_priv = to_driver(kobj);
         ssize_t ret = -EIO;
 
         if (drv_attr->store)
-                ret = drv_attr->store(drv, buf, count);
+                ret = drv_attr->store(drv_priv->driver, buf, count);
         return ret;
 }
 
@@ -71,22 +75,12 @@ static struct sysfs_ops driver_sysfs_ops = {
         .store  = drv_attr_store,
 };
 
-
-static void driver_release(struct kobject * kobj)
+static void driver_release(struct kobject *kobj)
 {
-        /*
-         * Yes this is an empty release function, it is this way because struct
-         * device is always a static object, not a dynamic one.  Yes, this is
-         * not nice and bad, but remember, drivers are code, reference counted
-         * by the module count, not a device, which is really data.  And yes,
-         * in the future I do want to have all drivers be created dynamically,
-         * and am working toward that goal, but it will take a bit longer...
-         *
-         * But do not let this example give _anyone_ the idea that they can
-         * create a release function without any code in it at all, to do that
-         * is almost always wrong.  If you have any questions about this,
-         * please send an email to <greg@kroah.com>
-         */
+        struct driver_private *drv_priv = to_driver(kobj);
+
+        pr_debug("driver: '%s': %s\n", kobject_name(kobj), __FUNCTION__);
+        kfree(drv_priv);
 }
 
 static struct kobj_type driver_ktype = {
@@ -94,34 +88,30 @@ static struct kobj_type driver_ktype = {
         .release        = driver_release,
 };
 
-
 /*
  * sysfs bindings for buses
  */
-
-
-static ssize_t
-bus_attr_show(struct kobject * kobj, struct attribute * attr, char * buf)
+static ssize_t bus_attr_show(struct kobject *kobj, struct attribute *attr,
+                             char *buf)
 {
-        struct bus_attribute * bus_attr = to_bus_attr(attr);
-        struct bus_type * bus = to_bus(kobj);
+        struct bus_attribute *bus_attr = to_bus_attr(attr);
+        struct bus_type_private *bus_priv = to_bus(kobj);
         ssize_t ret = 0;
 
         if (bus_attr->show)
-                ret = bus_attr->show(bus, buf);
+                ret = bus_attr->show(bus_priv->bus, buf);
         return ret;
 }
 
-static ssize_t
-bus_attr_store(struct kobject * kobj, struct attribute * attr,
-               const char * buf, size_t count)
+static ssize_t bus_attr_store(struct kobject *kobj, struct attribute *attr,
+                              const char *buf, size_t count)
 {
-        struct bus_attribute * bus_attr = to_bus_attr(attr);
-        struct bus_type * bus = to_bus(kobj);
+        struct bus_attribute *bus_attr = to_bus_attr(attr);
+        struct bus_type_private *bus_priv = to_bus(kobj);
         ssize_t ret = 0;
 
         if (bus_attr->store)
-                ret = bus_attr->store(bus, buf, count);
+                ret = bus_attr->store(bus_priv->bus, buf, count);
         return ret;
 }
 
@@ -130,24 +120,26 @@ static struct sysfs_ops bus_sysfs_ops = {
         .store  = bus_attr_store,
 };
 
-int bus_create_file(struct bus_type * bus, struct bus_attribute * attr)
+int bus_create_file(struct bus_type *bus, struct bus_attribute *attr)
 {
         int error;
         if (bus_get(bus)) {
-                error = sysfs_create_file(&bus->subsys.kobj, &attr->attr);
+                error = sysfs_create_file(&bus->p->subsys.kobj, &attr->attr);
                 bus_put(bus);
         } else
                 error = -EINVAL;
         return error;
 }
+EXPORT_SYMBOL_GPL(bus_create_file);
 
-void bus_remove_file(struct bus_type * bus, struct bus_attribute * attr)
+void bus_remove_file(struct bus_type *bus, struct bus_attribute *attr)
 {
         if (bus_get(bus)) {
-                sysfs_remove_file(&bus->subsys.kobj, &attr->attr);
+                sysfs_remove_file(&bus->p->subsys.kobj, &attr->attr);
                 bus_put(bus);
         }
 }
+EXPORT_SYMBOL_GPL(bus_remove_file);
 
 static struct kobj_type bus_ktype = {
         .sysfs_ops      = &bus_sysfs_ops,
@@ -166,7 +158,7 @@ static struct kset_uevent_ops bus_uevent_ops = {
         .filter = bus_uevent_filter,
 };
 
-static decl_subsys(bus, &bus_ktype, &bus_uevent_ops);
+static struct kset *bus_kset;
 
 
 #ifdef CONFIG_HOTPLUG
@@ -224,10 +216,13 @@ static ssize_t driver_bind(struct device_driver *drv,
                 if (dev->parent)
                         up(&dev->parent->sem);
 
-                if (err > 0)            /* success */
+                if (err > 0) {
+                        /* success */
                         err = count;
-                else if (err == 0)      /* driver didn't accept device */
+                } else if (err == 0) {
+                        /* driver didn't accept device */
                         err = -ENODEV;
+                }
         }
         put_device(dev);
         bus_put(bus);
@@ -237,16 +232,16 @@ static DRIVER_ATTR(bind, S_IWUSR, NULL, driver_bind);
 
 static ssize_t show_drivers_autoprobe(struct bus_type *bus, char *buf)
 {
-        return sprintf(buf, "%d\n", bus->drivers_autoprobe);
+        return sprintf(buf, "%d\n", bus->p->drivers_autoprobe);
 }
 
 static ssize_t store_drivers_autoprobe(struct bus_type *bus,
                                        const char *buf, size_t count)
 {
         if (buf[0] == '0')
-                bus->drivers_autoprobe = 0;
+                bus->p->drivers_autoprobe = 0;
         else
-                bus->drivers_autoprobe = 1;
+                bus->p->drivers_autoprobe = 1;
         return count;
 }
 
@@ -264,49 +259,49 @@ static ssize_t store_drivers_probe(struct bus_type *bus,
 }
 #endif
 
-static struct device * next_device(struct klist_iter * i)
+static struct device *next_device(struct klist_iter *i)
 {
-        struct klist_node * n = klist_next(i);
+        struct klist_node *n = klist_next(i);
         return n ? container_of(n, struct device, knode_bus) : NULL;
 }
 
 /**
- *      bus_for_each_dev - device iterator.
- *      @bus:   bus type.
- *      @start: device to start iterating from.
- *      @data:  data for the callback.
- *      @fn:    function to be called for each device.
+ * bus_for_each_dev - device iterator.
+ * @bus: bus type.
+ * @start: device to start iterating from.
+ * @data: data for the callback.
+ * @fn: function to be called for each device.
  *
- *      Iterate over @bus's list of devices, and call @fn for each,
- *      passing it @data. If @start is not NULL, we use that device to
- *      begin iterating from.
+ * Iterate over @bus's list of devices, and call @fn for each,
+ * passing it @data. If @start is not NULL, we use that device to
+ * begin iterating from.
  *
- *      We check the return of @fn each time. If it returns anything
- *      other than 0, we break out and return that value.
+ * We check the return of @fn each time. If it returns anything
+ * other than 0, we break out and return that value.
  *
- *      NOTE: The device that returns a non-zero value is not retained
- *      in any way, nor is its refcount incremented. If the caller needs
- *      to retain this data, it should do, and increment the reference
- *      count in the supplied callback.
+ * NOTE: The device that returns a non-zero value is not retained
+ * in any way, nor is its refcount incremented. If the caller needs
+ * to retain this data, it should do, and increment the reference
+ * count in the supplied callback.
  */
-
-int bus_for_each_dev(struct bus_type * bus, struct device * start,
-                     void * data, int (*fn)(struct device *, void *))
+int bus_for_each_dev(struct bus_type *bus, struct device *start,
+                     void *data, int (*fn)(struct device *, void *))
 {
         struct klist_iter i;
-        struct device * dev;
+        struct device *dev;
         int error = 0;
 
         if (!bus)
                 return -EINVAL;
 
-        klist_iter_init_node(&bus->klist_devices, &i,
+        klist_iter_init_node(&bus->p->klist_devices, &i,
                              (start ? &start->knode_bus : NULL));
         while ((dev = next_device(&i)) && !error)
                 error = fn(dev, data);
         klist_iter_exit(&i);
         return error;
 }
+EXPORT_SYMBOL_GPL(bus_for_each_dev);
 
 /**
  * bus_find_device - device iterator for locating a particular device.
@@ -323,9 +318,9 @@ int bus_for_each_dev(struct bus_type * bus, struct device * start,
  * if it does.  If the callback returns non-zero, this function will
  * return to the caller and not iterate over any more devices.
  */
-struct device * bus_find_device(struct bus_type *bus,
-                                struct device *start, void *data,
-                                int (*match)(struct device *, void *))
+struct device *bus_find_device(struct bus_type *bus,
+                               struct device *start, void *data,
+                               int (*match)(struct device *dev, void *data))
 {
         struct klist_iter i;
         struct device *dev;
@@ -333,7 +328,7 @@ struct device * bus_find_device(struct bus_type *bus,
         if (!bus)
                 return NULL;
 
-        klist_iter_init_node(&bus->klist_devices, &i,
+        klist_iter_init_node(&bus->p->klist_devices, &i,
                              (start ? &start->knode_bus : NULL));
         while ((dev = next_device(&i)))
                 if (match(dev, data) && get_device(dev))
@@ -341,51 +336,57 @@ struct device * bus_find_device(struct bus_type *bus,
         klist_iter_exit(&i);
         return dev;
 }
+EXPORT_SYMBOL_GPL(bus_find_device);
 
-
-static struct device_driver * next_driver(struct klist_iter * i)
+static struct device_driver *next_driver(struct klist_iter *i)
 {
-        struct klist_node * n = klist_next(i);
-        return n ? container_of(n, struct device_driver, knode_bus) : NULL;
+        struct klist_node *n = klist_next(i);
+        struct driver_private *drv_priv;
+
+        if (n) {
+                drv_priv = container_of(n, struct driver_private, knode_bus);
+                return drv_priv->driver;
+        }
+        return NULL;
 }
 
 /**
- *      bus_for_each_drv - driver iterator
- *      @bus:   bus we're dealing with.
- *      @start: driver to start iterating on.
- *      @data:  data to pass to the callback.
- *      @fn:    function to call for each driver.
+ * bus_for_each_drv - driver iterator
+ * @bus: bus we're dealing with.
+ * @start: driver to start iterating on.
+ * @data: data to pass to the callback.
+ * @fn: function to call for each driver.
  *
- *      This is nearly identical to the device iterator above.
- *      We iterate over each driver that belongs to @bus, and call
- *      @fn for each. If @fn returns anything but 0, we break out
- *      and return it. If @start is not NULL, we use it as the head
- *      of the list.
+ * This is nearly identical to the device iterator above.
+ * We iterate over each driver that belongs to @bus, and call
+ * @fn for each. If @fn returns anything but 0, we break out
+ * and return it. If @start is not NULL, we use it as the head
+ * of the list.
  *
- *      NOTE: we don't return the driver that returns a non-zero
- *      value, nor do we leave the reference count incremented for that
- *      driver. If the caller needs to know that info, it must set it
- *      in the callback. It must also be sure to increment the refcount
- *      so it doesn't disappear before returning to the caller.
+ * NOTE: we don't return the driver that returns a non-zero
+ * value, nor do we leave the reference count incremented for that
+ * driver. If the caller needs to know that info, it must set it
+ * in the callback. It must also be sure to increment the refcount
+ * so it doesn't disappear before returning to the caller.
  */
-
-int bus_for_each_drv(struct bus_type * bus, struct device_driver * start,
-                     void * data, int (*fn)(struct device_driver *, void *))
+int bus_for_each_drv(struct bus_type *bus, struct device_driver *start,
+                     void *data, int (*fn)(struct device_driver *, void *))
 {
         struct klist_iter i;
-        struct device_driver * drv;
+        struct device_driver *drv;
         int error = 0;
 
         if (!bus)
                 return -EINVAL;
 
-        klist_iter_init_node(&bus->klist_drivers, &i,
-                             start ? &start->knode_bus : NULL);
+        klist_iter_init_node(&bus->p->klist_drivers, &i,
+                             start ? &start->p->knode_bus : NULL);
         while ((drv = next_driver(&i)) && !error)
                 error = fn(drv, data);
         klist_iter_exit(&i);
         return error;
 }
+EXPORT_SYMBOL_GPL(bus_for_each_drv);
 
 static int device_add_attrs(struct bus_type *bus, struct device *dev)
 {
@@ -396,7 +397,7 @@ static int device_add_attrs(struct bus_type *bus, struct device *dev)
                 return 0;
 
         for (i = 0; attr_name(bus->dev_attrs[i]); i++) {
-                error = device_create_file(dev,&bus->dev_attrs[i]);
+                error = device_create_file(dev, &bus->dev_attrs[i]);
                 if (error) {
                         while (--i >= 0)
                                 device_remove_file(dev, &bus->dev_attrs[i]);
@@ -406,13 +407,13 @@ static int device_add_attrs(struct bus_type *bus, struct device *dev)
         return error;
 }
 
-static void device_remove_attrs(struct bus_type * bus, struct device * dev)
+static void device_remove_attrs(struct bus_type *bus, struct device *dev)
 {
         int i;
 
         if (bus->dev_attrs) {
                 for (i = 0; attr_name(bus->dev_attrs[i]); i++)
-                        device_remove_file(dev,&bus->dev_attrs[i]);
+                        device_remove_file(dev, &bus->dev_attrs[i]);
         }
 }
 
@@ -420,7 +421,7 @@ static void device_remove_attrs(struct bus_type * bus, struct device * dev)
 static int make_deprecated_bus_links(struct device *dev)
 {
         return sysfs_create_link(&dev->kobj,
-                                 &dev->bus->subsys.kobj, "bus");
+                                 &dev->bus->p->subsys.kobj, "bus");
 }
 
 static void remove_deprecated_bus_links(struct device *dev)
@@ -433,28 +434,28 @@ static inline void remove_deprecated_bus_links(struct device *dev) { }
 #endif
 
 /**
- *      bus_add_device - add device to bus
- *      @dev:   device being added
+ * bus_add_device - add device to bus
+ * @dev: device being added
  *
- *      - Add the device to its bus's list of devices.
- *      - Create link to device's bus.
+ * - Add the device to its bus's list of devices.
+ * - Create link to device's bus.
  */
-int bus_add_device(struct device * dev)
+int bus_add_device(struct device *dev)
 {
-        struct bus_type * bus = bus_get(dev->bus);
+        struct bus_type *bus = bus_get(dev->bus);
         int error = 0;
 
         if (bus) {
-                pr_debug("bus %s: add device %s\n", bus->name, dev->bus_id);
+                pr_debug("bus: '%s': add device %s\n", bus->name, dev->bus_id);
                 error = device_add_attrs(bus, dev);
                 if (error)
                         goto out_put;
-                error = sysfs_create_link(&bus->devices.kobj,
+                error = sysfs_create_link(&bus->p->devices_kset->kobj,
                                                 &dev->kobj, dev->bus_id);
                 if (error)
                         goto out_id;
                 error = sysfs_create_link(&dev->kobj,
-                                &dev->bus->subsys.kobj, "subsystem");
+                                &dev->bus->p->subsys.kobj, "subsystem");
                 if (error)
                         goto out_subsys;
                 error = make_deprecated_bus_links(dev);
@@ -466,7 +467,7 @@ int bus_add_device(struct device * dev)
 out_deprecated:
         sysfs_remove_link(&dev->kobj, "subsystem");
 out_subsys:
-        sysfs_remove_link(&bus->devices.kobj, dev->bus_id);
+        sysfs_remove_link(&bus->p->devices_kset->kobj, dev->bus_id);
 out_id:
         device_remove_attrs(bus, dev);
 out_put:
@@ -475,56 +476,58 @@ out_put:
 }
 
 /**
- *      bus_attach_device - add device to bus
- *      @dev:   device tried to attach to a driver
+ * bus_attach_device - add device to bus
+ * @dev: device tried to attach to a driver
  *
- *      - Add device to bus's list of devices.
- *      - Try to attach to driver.
+ * - Add device to bus's list of devices.
+ * - Try to attach to driver.
  */
-void bus_attach_device(struct device * dev)
+void bus_attach_device(struct device *dev)
 {
         struct bus_type *bus = dev->bus;
         int ret = 0;
 
         if (bus) {
                 dev->is_registered = 1;
-                if (bus->drivers_autoprobe)
+                if (bus->p->drivers_autoprobe)
                         ret = device_attach(dev);
                 WARN_ON(ret < 0);
                 if (ret >= 0)
-                        klist_add_tail(&dev->knode_bus, &bus->klist_devices);
+                        klist_add_tail(&dev->knode_bus, &bus->p->klist_devices);
                 else
                         dev->is_registered = 0;
         }
 }
 
 /**
- *      bus_remove_device - remove device from bus
- *      @dev:   device to be removed
+ * bus_remove_device - remove device from bus
+ * @dev: device to be removed
  *
- *      - Remove symlink from bus's directory.
- *      - Delete device from bus's list.
- *      - Detach from its driver.
- *      - Drop reference taken in bus_add_device().
+ * - Remove symlink from bus's directory.
+ * - Delete device from bus's list.
+ * - Detach from its driver.
+ * - Drop reference taken in bus_add_device().
  */
-void bus_remove_device(struct device * dev)
+void bus_remove_device(struct device *dev)
 {
         if (dev->bus) {
                 sysfs_remove_link(&dev->kobj, "subsystem");
                 remove_deprecated_bus_links(dev);
-                sysfs_remove_link(&dev->bus->devices.kobj, dev->bus_id);
+                sysfs_remove_link(&dev->bus->p->devices_kset->kobj,
+                                  dev->bus_id);
                 device_remove_attrs(dev->bus, dev);
                 if (dev->is_registered) {
                         dev->is_registered = 0;
                         klist_del(&dev->knode_bus);
                 }
-                pr_debug("bus %s: remove device %s\n", dev->bus->name, dev->bus_id);
+                pr_debug("bus: '%s': remove device %s\n",
+                         dev->bus->name, dev->bus_id);
                 device_release_driver(dev);
                 bus_put(dev->bus);
         }
 }
 
-static int driver_add_attrs(struct bus_type * bus, struct device_driver * drv)
+static int driver_add_attrs(struct bus_type *bus, struct device_driver *drv)
 {
         int error = 0;
         int i;
@@ -533,19 +536,19 @@ static int driver_add_attrs(struct bus_type * bus, struct device_driver * drv)
                 for (i = 0; attr_name(bus->drv_attrs[i]); i++) {
                         error = driver_create_file(drv, &bus->drv_attrs[i]);
                         if (error)
-                                goto Err;
+                                goto err;
                 }
         }
- Done:
+done:
         return error;
- Err:
+err:
         while (--i >= 0)
                 driver_remove_file(drv, &bus->drv_attrs[i]);
-        goto Done;
+        goto done;
 }
 
-
-static void driver_remove_attrs(struct bus_type * bus, struct device_driver * drv)
+static void driver_remove_attrs(struct bus_type *bus,
+                                struct device_driver *drv)
 {
         int i;
 
@@ -616,39 +619,46 @@ static ssize_t driver_uevent_store(struct device_driver *drv,
         enum kobject_action action;
 
         if (kobject_action_type(buf, count, &action) == 0)
-                kobject_uevent(&drv->kobj, action);
+                kobject_uevent(&drv->p->kobj, action);
         return count;
 }
 static DRIVER_ATTR(uevent, S_IWUSR, NULL, driver_uevent_store);
 
 /**
- *      bus_add_driver - Add a driver to the bus.
- *      @drv:   driver.
- *
+ * bus_add_driver - Add a driver to the bus.
+ * @drv: driver.
  */
 int bus_add_driver(struct device_driver *drv)
 {
-        struct bus_type * bus = bus_get(drv->bus);
+        struct bus_type *bus;
+        struct driver_private *priv;
         int error = 0;
 
+        bus = bus_get(drv->bus);
         if (!bus)
                 return -EINVAL;
 
-        pr_debug("bus %s: add driver %s\n", bus->name, drv->name);
-        error = kobject_set_name(&drv->kobj, "%s", drv->name);
-        if (error)
-                goto out_put_bus;
-        drv->kobj.kset = &bus->drivers;
-        error = kobject_register(&drv->kobj);
+        pr_debug("bus: '%s': add driver %s\n", bus->name, drv->name);
+
+        priv = kzalloc(sizeof(*priv), GFP_KERNEL);
+        if (!priv)
+                return -ENOMEM;
+
+        klist_init(&priv->klist_devices, NULL, NULL);
+        priv->driver = drv;
+        drv->p = priv;
+        priv->kobj.kset = bus->p->drivers_kset;
+        error = kobject_init_and_add(&priv->kobj, &driver_ktype, NULL,
+                                     "%s", drv->name);
         if (error)
                 goto out_put_bus;
 
-        if (drv->bus->drivers_autoprobe) {
+        if (drv->bus->p->drivers_autoprobe) {
                 error = driver_attach(drv);
                 if (error)
                         goto out_unregister;
         }
-        klist_add_tail(&drv->knode_bus, &bus->klist_drivers);
+        klist_add_tail(&priv->knode_bus, &bus->p->klist_drivers);
         module_add_driver(drv->owner, drv);
 
         error = driver_create_file(drv, &driver_attr_uevent);
@@ -669,24 +679,24 @@ int bus_add_driver(struct device_driver *drv)
                         __FUNCTION__, drv->name);
         }
 
+        kobject_uevent(&priv->kobj, KOBJ_ADD);
         return error;
 out_unregister:
-        kobject_unregister(&drv->kobj);
+        kobject_put(&priv->kobj);
 out_put_bus:
         bus_put(bus);
         return error;
 }
 
 /**
- *      bus_remove_driver - delete driver from bus's knowledge.
- *      @drv:   driver.
+ * bus_remove_driver - delete driver from bus's knowledge.
+ * @drv: driver.
  *
- *      Detach the driver from the devices it controls, and remove
- *      it from its bus's list of drivers. Finally, we drop the reference
- *      to the bus we took in bus_add_driver().
+ * Detach the driver from the devices it controls, and remove
+ * it from its bus's list of drivers. Finally, we drop the reference
+ * to the bus we took in bus_add_driver().
  */
-
-void bus_remove_driver(struct device_driver * drv)
+void bus_remove_driver(struct device_driver *drv)
 {
         if (!drv->bus)
                 return;
@@ -694,18 +704,17 @@ void bus_remove_driver(struct device_driver * drv)
         remove_bind_files(drv);
         driver_remove_attrs(drv->bus, drv);
         driver_remove_file(drv, &driver_attr_uevent);
-        klist_remove(&drv->knode_bus);
-        pr_debug("bus %s: remove driver %s\n", drv->bus->name, drv->name);
+        klist_remove(&drv->p->knode_bus);
+        pr_debug("bus: '%s': remove driver %s\n", drv->bus->name, drv->name);
         driver_detach(drv);
         module_remove_driver(drv);
-        kobject_unregister(&drv->kobj);
+        kobject_put(&drv->p->kobj);
         bus_put(drv->bus);
 }
 
-
 /* Helper for bus_rescan_devices's iter */
 static int __must_check bus_rescan_devices_helper(struct device *dev,
-                                                void *data)
+                                                  void *data)
 {
         int ret = 0;
 
@@ -727,10 +736,11 @@ static int __must_check bus_rescan_devices_helper(struct device *dev,
  * attached and rescan it against existing drivers to see if it matches
  * any by calling device_attach() for the unbound devices.
  */
-int bus_rescan_devices(struct bus_type * bus)
+int bus_rescan_devices(struct bus_type *bus)
 {
         return bus_for_each_dev(bus, NULL, NULL, bus_rescan_devices_helper);
 }
+EXPORT_SYMBOL_GPL(bus_rescan_devices);
 
 /**
  * device_reprobe - remove driver for a device and probe for a new driver
@@ -755,55 +765,55 @@ int device_reprobe(struct device *dev)
 EXPORT_SYMBOL_GPL(device_reprobe);
 
 /**
- *      find_bus - locate bus by name.
- *      @name:  name of bus.
+ * find_bus - locate bus by name.
+ * @name: name of bus.
  *
- *      Call kset_find_obj() to iterate over list of buses to
- *      find a bus by name. Return bus if found.
+ * Call kset_find_obj() to iterate over list of buses to
+ * find a bus by name. Return bus if found.
  *
- *      Note that kset_find_obj increments bus' reference count.
+ * Note that kset_find_obj increments bus' reference count.
  */
 #if 0
-struct bus_type * find_bus(char * name)
+struct bus_type *find_bus(char *name)
 {
-        struct kobject * k = kset_find_obj(&bus_subsys.kset, name);
+        struct kobject *k = kset_find_obj(bus_kset, name);
         return k ? to_bus(k) : NULL;
 }
 #endif  /*  0  */
 
 
 /**
- *      bus_add_attrs - Add default attributes for this bus.
- *      @bus:   Bus that has just been registered.
+ * bus_add_attrs - Add default attributes for this bus.
+ * @bus: Bus that has just been registered.
  */
 
-static int bus_add_attrs(struct bus_type * bus)
+static int bus_add_attrs(struct bus_type *bus)
 {
         int error = 0;
         int i;
 
         if (bus->bus_attrs) {
                 for (i = 0; attr_name(bus->bus_attrs[i]); i++) {
-                        error = bus_create_file(bus,&bus->bus_attrs[i]);
+                        error = bus_create_file(bus, &bus->bus_attrs[i]);
                         if (error)
-                                goto Err;
+                                goto err;
                 }
         }
- Done:
+done:
         return error;
- Err:
+err:
         while (--i >= 0)
-                bus_remove_file(bus,&bus->bus_attrs[i]);
-        goto Done;
+                bus_remove_file(bus, &bus->bus_attrs[i]);
+        goto done;
 }
 
-static void bus_remove_attrs(struct bus_type * bus)
+static void bus_remove_attrs(struct bus_type *bus)
 {
         int i;
 
         if (bus->bus_attrs) {
                 for (i = 0; attr_name(bus->bus_attrs[i]); i++)
-                        bus_remove_file(bus,&bus->bus_attrs[i]);
+                        bus_remove_file(bus, &bus->bus_attrs[i]);
         }
 }
 
@@ -827,32 +837,42 @@ static ssize_t bus_uevent_store(struct bus_type *bus,
         enum kobject_action action;
 
         if (kobject_action_type(buf, count, &action) == 0)
-                kobject_uevent(&bus->subsys.kobj, action);
+                kobject_uevent(&bus->p->subsys.kobj, action);
         return count;
 }
 static BUS_ATTR(uevent, S_IWUSR, NULL, bus_uevent_store);
 
 /**
- *      bus_register - register a bus with the system.
- *      @bus:   bus.
+ * bus_register - register a bus with the system.
+ * @bus: bus.
  *
- *      Once we have that, we registered the bus with the kobject
- *      infrastructure, then register the children subsystems it has:
- *      the devices and drivers that belong to the bus.
+ * Once we have that, we registered the bus with the kobject
+ * infrastructure, then register the children subsystems it has:
+ * the devices and drivers that belong to the bus.
  */
-int bus_register(struct bus_type * bus)
+int bus_register(struct bus_type *bus)
 {
         int retval;
+        struct bus_type_private *priv;
+
+        priv = kzalloc(sizeof(struct bus_type_private), GFP_KERNEL);
+        if (!priv)
+                return -ENOMEM;
 
-        BLOCKING_INIT_NOTIFIER_HEAD(&bus->bus_notifier);
+        priv->bus = bus;
+        bus->p = priv;
 
-        retval = kobject_set_name(&bus->subsys.kobj, "%s", bus->name);
+        BLOCKING_INIT_NOTIFIER_HEAD(&priv->bus_notifier);
+
+        retval = kobject_set_name(&priv->subsys.kobj, "%s", bus->name);
         if (retval)
                 goto out;
 
-        bus->subsys.kobj.kset = &bus_subsys;
+        priv->subsys.kobj.kset = bus_kset;
+        priv->subsys.kobj.ktype = &bus_ktype;
+        priv->drivers_autoprobe = 1;
 
-        retval = subsystem_register(&bus->subsys);
+        retval = kset_register(&priv->subsys);
         if (retval)
                 goto out;
 
@@ -860,23 +880,23 @@ int bus_register(struct bus_type * bus)
         if (retval)
                 goto bus_uevent_fail;
 
-        kobject_set_name(&bus->devices.kobj, "devices");
-        bus->devices.kobj.parent = &bus->subsys.kobj;
-        retval = kset_register(&bus->devices);
-        if (retval)
+        priv->devices_kset = kset_create_and_add("devices", NULL,
+                                                 &priv->subsys.kobj);
+        if (!priv->devices_kset) {
+                retval = -ENOMEM;
                 goto bus_devices_fail;
+        }
 
-        kobject_set_name(&bus->drivers.kobj, "drivers");
-        bus->drivers.kobj.parent = &bus->subsys.kobj;
-        bus->drivers.ktype = &driver_ktype;
-        retval = kset_register(&bus->drivers);
-        if (retval)
+        priv->drivers_kset = kset_create_and_add("drivers", NULL,
+                                                 &priv->subsys.kobj);
+        if (!priv->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);
+        klist_init(&priv->klist_devices, klist_devices_get, klist_devices_put);
+        klist_init(&priv->klist_drivers, NULL, NULL);
 
-        bus->drivers_autoprobe = 1;
         retval = add_probe_files(bus);
         if (retval)
                 goto bus_probe_files_fail;
@@ -885,66 +905,73 @@ int bus_register(struct bus_type * bus)
         if (retval)
                 goto bus_attrs_fail;
 
-        pr_debug("bus type '%s' registered\n", bus->name);
+        pr_debug("bus: '%s': registered\n", bus->name);
         return 0;
 
 bus_attrs_fail:
         remove_probe_files(bus);
 bus_probe_files_fail:
-        kset_unregister(&bus->drivers);
+        kset_unregister(bus->p->drivers_kset);
 bus_drivers_fail:
-        kset_unregister(&bus->devices);
+        kset_unregister(bus->p->devices_kset);
 bus_devices_fail:
         bus_remove_file(bus, &bus_attr_uevent);
 bus_uevent_fail:
-        subsystem_unregister(&bus->subsys);
+        kset_unregister(&bus->p->subsys);
+        kfree(bus->p);
 out:
         return retval;
 }
+EXPORT_SYMBOL_GPL(bus_register);
 
 /**
- *      bus_unregister - remove a bus from the system
- *      @bus:   bus.
+ * bus_unregister - remove a bus from the system
+ * @bus: bus.
  *
- *      Unregister the child subsystems and the bus itself.
- *      Finally, we call bus_put() to release the refcount
+ * Unregister the child subsystems and the bus itself.
+ * Finally, we call bus_put() to release the refcount
  */
-void bus_unregister(struct bus_type * bus)
+void bus_unregister(struct bus_type *bus)
 {
-        pr_debug("bus %s: unregistering\n", bus->name);
+        pr_debug("bus: '%s': unregistering\n", bus->name);
         bus_remove_attrs(bus);
         remove_probe_files(bus);
-        kset_unregister(&bus->drivers);
-        kset_unregister(&bus->devices);
+        kset_unregister(bus->p->drivers_kset);
+        kset_unregister(bus->p->devices_kset);
         bus_remove_file(bus, &bus_attr_uevent);
-        subsystem_unregister(&bus->subsys);
+        kset_unregister(&bus->p->subsys);
+        kfree(bus->p);
 }
+EXPORT_SYMBOL_GPL(bus_unregister);
 
 int bus_register_notifier(struct bus_type *bus, struct notifier_block *nb)
 {
-        return blocking_notifier_chain_register(&bus->bus_notifier, nb);
+        return blocking_notifier_chain_register(&bus->p->bus_notifier, nb);
 }
 EXPORT_SYMBOL_GPL(bus_register_notifier);
 
 int bus_unregister_notifier(struct bus_type *bus, struct notifier_block *nb)
 {
-        return blocking_notifier_chain_unregister(&bus->bus_notifier, nb);
+        return blocking_notifier_chain_unregister(&bus->p->bus_notifier, nb);
 }
 EXPORT_SYMBOL_GPL(bus_unregister_notifier);
 
-int __init buses_init(void)
+struct kset *bus_get_kset(struct bus_type *bus)
 {
-        return subsystem_register(&bus_subsys);
+        return &bus->p->subsys;
 }
+EXPORT_SYMBOL_GPL(bus_get_kset);
 
+struct klist *bus_get_device_klist(struct bus_type *bus)
+{
+        return &bus->p->klist_devices;
+}
+EXPORT_SYMBOL_GPL(bus_get_device_klist);
 
-EXPORT_SYMBOL_GPL(bus_for_each_dev);
-EXPORT_SYMBOL_GPL(bus_find_device);
-EXPORT_SYMBOL_GPL(bus_for_each_drv);
-
-EXPORT_SYMBOL_GPL(bus_register);
-EXPORT_SYMBOL_GPL(bus_unregister);
-EXPORT_SYMBOL_GPL(bus_rescan_devices);
-
-EXPORT_SYMBOL_GPL(bus_create_file);
-EXPORT_SYMBOL_GPL(bus_remove_file);
+int __init buses_init(void)
+{
+        bus_kset = kset_create_and_add("bus", &bus_uevent_ops, NULL);
+        if (!bus_kset)
+                return -ENOMEM;
+        return 0;
+}