Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6: (75 commits)
  PM: merge device power-management source files
  sysfs: add copyrights
  kobject: update the copyrights
  kset: add some kerneldoc to help describe what these strange things are
  Driver core: rename ktype_edd and ktype_efivar
  Driver core: rename ktype_driver
  Driver core: rename ktype_device
  Driver core: rename ktype_class
  driver core: remove subsystem_init()
  sysfs: move sysfs file poll implementation to sysfs_open_dirent
  sysfs: implement sysfs_open_dirent
  sysfs: move sysfs_dirent->s_children into sysfs_dirent->s_dir
  sysfs: make sysfs_root a regular directory dirent
  sysfs: open code sysfs_attach_dentry()
  sysfs: make s_elem an anonymous union
  sysfs: make bin attr open get active reference of parent too
  sysfs: kill unnecessary NULL pointer check in sysfs_release()
  sysfs: kill unnecessary sysfs_get() in open paths
  sysfs: reposition sysfs_dirent->s_mode.
  sysfs: kill sysfs_update_file()
  ...

14 files changed, 503 insertions, 650 deletions

diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig
index 5d6312e33490..d7da109c24fd 100644
--- a/drivers/base/Kconfig
+++ b/drivers/base/Kconfig
@@ -1,5 +1,13 @@
 menu "Generic Driver Options"
 
+config UEVENT_HELPER_PATH
+        string "path to uevent helper"
+        depends on HOTPLUG
+        default "/sbin/hotplug"
+        help
+          Path to uevent helper program forked by the kernel for
+          every uevent.
+
 config STANDALONE
         bool "Select only drivers that don't need compile-time external firmware" if EXPERIMENTAL
         default y
diff --git a/drivers/base/base.h b/drivers/base/base.h
index 47eb02d9f1af..10b2fb6c9ce6 100644
--- a/drivers/base/base.h
+++ b/drivers/base/base.h
@@ -18,8 +18,6 @@ extern int attribute_container_init(void);
 extern int bus_add_device(struct device * dev);
 extern void bus_attach_device(struct device * dev);
 extern void bus_remove_device(struct device * dev);
-extern struct bus_type *get_bus(struct bus_type * bus);
-extern void put_bus(struct bus_type * bus);
 
 extern int bus_add_driver(struct device_driver *);
 extern void bus_remove_driver(struct device_driver *);
diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index 61c67526a656..9a19b071c573 100644
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -30,6 +30,17 @@
 static int __must_check bus_rescan_devices_helper(struct device *dev,
                                                 void *data);
 
+static struct bus_type *bus_get(struct bus_type *bus)
+{
+        return bus ? container_of(kset_get(&bus->subsys),
+                                struct bus_type, subsys) : NULL;
+}
+
+static void bus_put(struct bus_type *bus)
+{
+        kset_put(&bus->subsys);
+}
+
 static ssize_t
 drv_attr_show(struct kobject * kobj, struct attribute * attr, char * buf)
 {
@@ -78,7 +89,7 @@ static void driver_release(struct kobject * kobj)
          */
 }
 
-static struct kobj_type ktype_driver = {
+static struct kobj_type driver_ktype = {
         .sysfs_ops      = &driver_sysfs_ops,
         .release        = driver_release,
 };
@@ -122,9 +133,9 @@ static struct sysfs_ops bus_sysfs_ops = {
 int bus_create_file(struct bus_type * bus, struct bus_attribute * attr)
 {
         int error;
-        if (get_bus(bus)) {
+        if (bus_get(bus)) {
                 error = sysfs_create_file(&bus->subsys.kobj, &attr->attr);
-                put_bus(bus);
+                bus_put(bus);
         } else
                 error = -EINVAL;
         return error;
@@ -132,9 +143,9 @@ int bus_create_file(struct bus_type * bus, struct bus_attribute * attr)
 
 void bus_remove_file(struct bus_type * bus, struct bus_attribute * attr)
 {
-        if (get_bus(bus)) {
+        if (bus_get(bus)) {
                 sysfs_remove_file(&bus->subsys.kobj, &attr->attr);
-                put_bus(bus);
+                bus_put(bus);
         }
 }
 
@@ -172,7 +183,7 @@ static int driver_helper(struct device *dev, void *data)
 static ssize_t driver_unbind(struct device_driver *drv,
                              const char *buf, size_t count)
 {
-        struct bus_type *bus = get_bus(drv->bus);
+        struct bus_type *bus = bus_get(drv->bus);
         struct device *dev;
         int err = -ENODEV;
 
@@ -186,7 +197,7 @@ static ssize_t driver_unbind(struct device_driver *drv,
                 err = count;
         }
         put_device(dev);
-        put_bus(bus);
+        bus_put(bus);
         return err;
 }
 static DRIVER_ATTR(unbind, S_IWUSR, NULL, driver_unbind);
@@ -199,7 +210,7 @@ static DRIVER_ATTR(unbind, S_IWUSR, NULL, driver_unbind);
 static ssize_t driver_bind(struct device_driver *drv,
                            const char *buf, size_t count)
 {
-        struct bus_type *bus = get_bus(drv->bus);
+        struct bus_type *bus = bus_get(drv->bus);
         struct device *dev;
         int err = -ENODEV;
 
@@ -219,7 +230,7 @@ static ssize_t driver_bind(struct device_driver *drv,
                         err = -ENODEV;
         }
         put_device(dev);
-        put_bus(bus);
+        bus_put(bus);
         return err;
 }
 static DRIVER_ATTR(bind, S_IWUSR, NULL, driver_bind);
@@ -430,7 +441,7 @@ static inline void remove_deprecated_bus_links(struct device *dev) { }
  */
 int bus_add_device(struct device * dev)
 {
-        struct bus_type * bus = get_bus(dev->bus);
+        struct bus_type * bus = bus_get(dev->bus);
         int error = 0;
 
         if (bus) {
@@ -459,7 +470,7 @@ out_subsys:
 out_id:
         device_remove_attrs(bus, dev);
 out_put:
-        put_bus(dev->bus);
+        bus_put(dev->bus);
         return error;
 }
 
@@ -509,7 +520,7 @@ void bus_remove_device(struct device * dev)
                 }
                 pr_debug("bus %s: remove device %s\n", dev->bus->name, dev->bus_id);
                 device_release_driver(dev);
-                put_bus(dev->bus);
+                bus_put(dev->bus);
         }
 }
 
@@ -568,32 +579,29 @@ static void remove_bind_files(struct device_driver *drv)
         driver_remove_file(drv, &driver_attr_unbind);
 }