Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6

* 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
  driver core: Document that device_rename() is only for networking
  sysfs: remove useless test from sysfs_merge_group
  driver-core: merge private parts of class and bus
  driver core: fix whitespace in class_attr_string

6 files changed, 70 insertions, 88 deletions

diff --git a/drivers/base/base.h b/drivers/base/base.h
index 2ca7f5b7b824..19f49e41ce5d 100644
--- a/drivers/base/base.h
+++ b/drivers/base/base.h
@@ -1,31 +1,46 @@
 
 /**
- * struct bus_type_private - structure to hold the private to the driver core portions of the bus_type structure.
+ * struct subsys_private - structure to hold the private to the driver core portions of the bus_type/class structure.
  *
- * @subsys - the struct kset that defines this bus.  This is the main kobject
- * @drivers_kset - the list of drivers associated with this bus
- * @devices_kset - the list of devices associated with this bus
+ * @subsys - the struct kset that defines this subsystem
+ * @devices_kset - the list of devices associated
+ *
+ * @drivers_kset - the list of drivers associated
  * @klist_devices - the klist to iterate over the @devices_kset
  * @klist_drivers - the klist to iterate over the @drivers_kset
  * @bus_notifier - the bus notifier list for anything that cares about things
- * on this bus.
+ *                 on this bus.
  * @bus - pointer back to the struct bus_type that this structure is associated
- * with.
+ *        with.
+ *
+ * @class_interfaces - list of class_interfaces associated
+ * @glue_dirs - "glue" directory to put in-between the parent device to
+ *              avoid namespace conflicts
+ * @class_mutex - mutex to protect the children, devices, and interfaces lists.
+ * @class - pointer back to the struct class that this structure is associated
+ *          with.
  *
  * This structure is the one that is the actual kobject allowing struct
- * bus_type to be statically allocated safely.  Nothing outside of the driver
- * core should ever touch these fields.
+ * bus_type/class to be statically allocated safely.  Nothing outside of the
+ * driver core should ever touch these fields.
  */
-struct bus_type_private {
+struct subsys_private {
         struct kset subsys;
-        struct kset *drivers_kset;
         struct kset *devices_kset;
+
+        struct kset *drivers_kset;
         struct klist klist_devices;
         struct klist klist_drivers;
         struct blocking_notifier_head bus_notifier;
         unsigned int drivers_autoprobe:1;
         struct bus_type *bus;
+
+        struct list_head class_interfaces;
+        struct kset glue_dirs;
+        struct mutex class_mutex;
+        struct class *class;
 };
+#define to_subsys_private(obj) container_of(obj, struct subsys_private, subsys.kobj)
 
 struct driver_private {
         struct kobject kobj;
@@ -36,33 +51,6 @@ struct driver_private {
 };
 #define to_driver(obj) container_of(obj, struct driver_private, kobj)
 
-
-/**
- * struct class_private - structure to hold the private to the driver core portions of the class structure.
- *
- * @class_subsys - the struct kset that defines this class.  This is the main kobject
- * @class_devices - list of devices associated with this class
- * @class_interfaces - list of class_interfaces associated with this class
- * @class_dirs - "glue" directory for virtual devices associated with this class
- * @class_mutex - mutex to protect the children, devices, and interfaces lists.
- * @class - pointer back to the struct class that this structure is associated
- * with.
- *
- * This structure is the one that is the actual kobject allowing struct
- * class to be statically allocated safely.  Nothing outside of the driver
- * core should ever touch these fields.
- */
-struct class_private {
-        struct kset class_subsys;
-        struct klist class_devices;
-        struct list_head class_interfaces;
-        struct kset class_dirs;
-        struct mutex class_mutex;
-        struct class *class;
-};
-#define to_class(obj)   \
-        container_of(obj, struct class_private, class_subsys.kobj)
-
 /**
  * struct device_private - structure to hold the private to the driver core portions of the device structure.
  *
diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index 33c270a64db7..e243bd49764b 100644
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -20,7 +20,6 @@
 #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_private, subsys.kobj)
 
 /*
  * sysfs bindings for drivers
@@ -96,11 +95,11 @@ 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_private *bus_priv = to_bus(kobj);
+        struct subsys_private *subsys_priv = to_subsys_private(kobj);
         ssize_t ret = 0;
 
         if (bus_attr->show)
-                ret = bus_attr->show(bus_priv->bus, buf);
+                ret = bus_attr->show(subsys_priv->bus, buf);
         return ret;
 }
 
@@ -108,11 +107,11 @@ 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_private *bus_priv = to_bus(kobj);
+        struct subsys_private *subsys_priv = to_subsys_private(kobj);
         ssize_t ret = 0;
 
         if (bus_attr->store)
-                ret = bus_attr->store(bus_priv->bus, buf, count);
+                ret = bus_attr->store(subsys_priv->bus, buf, count);
         return ret;
 }
 
@@ -858,9 +857,9 @@ static BUS_ATTR(uevent, S_IWUSR, NULL, bus_uevent_store);
 int bus_register(struct bus_type *bus)
 {
         int retval;
-        struct bus_type_private *priv;
+        struct subsys_private *priv;
 
-        priv = kzalloc(sizeof(struct bus_type_private), GFP_KERNEL);
+        priv = kzalloc(sizeof(struct subsys_private), GFP_KERNEL);
         if (!priv)
                 return -ENOMEM;
 
diff --git a/drivers/base/class.c b/drivers/base/class.c
index 9c63a5687d69..4f1df2e8fd74 100644
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
@@ -27,7 +27,7 @@ static ssize_t class_attr_show(struct kobject *kobj, struct attribute *attr,
                                char *buf)
 {
         struct class_attribute *class_attr = to_class_attr(attr);
-        struct class_private *cp = to_class(kobj);
+        struct subsys_private *cp = to_subsys_private(kobj);
         ssize_t ret = -EIO;
 
         if (class_attr->show)
@@ -39,7 +39,7 @@ static ssize_t class_attr_store(struct kobject *kobj, struct attribute *attr,
                                 const char *buf, size_t count)
 {
         struct class_attribute *class_attr = to_class_attr(attr);
-        struct class_private *cp = to_class(kobj);
+        struct subsys_private *cp = to_subsys_private(kobj);