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: (28 commits)
  sysfs: Shadow directory support
  Driver Core: Increase the default timeout value of the firmware subsystem
  Driver core: allow to delay the uevent at device creation time
  Driver core: add device_type to struct device
  Driver core: add uevent vars for devices of a class
  SYSFS: Fix missing include of list.h in sysfs.h
  HOWTO: Add a reference to Harbison and Steele
  sysfs: error handling in sysfs, fill_read_buffer()
  kobject: kobject_put cleanup
  sysfs: kobject_put cleanup
  sysfs: suppress lockdep warnings
  Driver core: fix race in sysfs between sysfs_remove_file() and read()/write()
  driver core: Change function call order in device_bind_driver().
  driver core: Don't stop probing on ->probe errors.
  driver core fixes: device_register() retval check in platform.c
  driver core fixes: make_class_name() retval checks
  /sys/modules/*/holders
  USB: add the sysfs driver name to all modules
  SERIO: add the sysfs driver name to all modules
  PCI: add the sysfs driver name to all modules
  ...

11 files changed, 202 insertions, 141 deletions

diff --git a/drivers/net/arm/at91_ether.c b/drivers/net/arm/at91_ether.c
index fada15d959de..1621b8fe35cf 100644
--- a/drivers/net/arm/at91_ether.c
+++ b/drivers/net/arm/at91_ether.c
@@ -641,7 +641,7 @@ static void at91ether_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo
 {
         strlcpy(info->driver, DRV_NAME, sizeof(info->driver));
         strlcpy(info->version, DRV_VERSION, sizeof(info->version));
-        strlcpy(info->bus_info, dev->class_dev.dev->bus_id, sizeof(info->bus_info));
+        strlcpy(info->bus_info, dev->dev.parent->bus_id, sizeof(info->bus_info));
 }
 
 static const struct ethtool_ops at91ether_ethtool_ops = {
diff --git a/drivers/net/arm/etherh.c b/drivers/net/arm/etherh.c
index f3faa4fe58e7..72c41f5907f2 100644
--- a/drivers/net/arm/etherh.c
+++ b/drivers/net/arm/etherh.c
@@ -587,7 +587,7 @@ static void etherh_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *i
 {
         strlcpy(info->driver, DRV_NAME, sizeof(info->driver));
         strlcpy(info->version, DRV_VERSION, sizeof(info->version));
-        strlcpy(info->bus_info, dev->class_dev.dev->bus_id,
+        strlcpy(info->bus_info, dev->dev.parent->bus_id,
                 sizeof(info->bus_info));
 }
 
diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c
index 8e317e115532..878f7aabeeac 100644
--- a/drivers/net/bonding/bond_sysfs.c
+++ b/drivers/net/bonding/bond_sysfs.c
@@ -39,8 +39,7 @@
 
 /* #define BONDING_DEBUG 1 */
 #include "bonding.h"
-#define to_class_dev(obj) container_of(obj,struct class_device,kobj)
-#define to_net_dev(class) container_of(class, struct net_device, class_dev)
+#define to_dev(obj)     container_of(obj,struct device,kobj)
 #define to_bond(cd)     ((struct bonding *)(to_net_dev(cd)->priv))
 
 /*---------------------------- Declarations -------------------------------*/
@@ -154,7 +153,7 @@ static ssize_t bonding_store_bonds(struct class *cls, const char *buffer, size_t
                                  * If it's > expected, then there's a file open,
                                  * and we have to fail.
                                  */
-                                if (atomic_read(&bond->dev->class_dev.kobj.kref.refcount)
+                                if (atomic_read(&bond->dev->dev.kobj.kref.refcount)
                                                         > expected_refcount){
                                         rtnl_unlock();
                                         printk(KERN_INFO DRV_NAME
@@ -201,13 +200,13 @@ int bond_create_slave_symlinks(struct net_device *master, struct net_device *sla
         int ret = 0;
 
         /* first, create a link from the slave back to the master */
-        ret = sysfs_create_link(&(slave->class_dev.kobj), &(master->class_dev.kobj),
+        ret = sysfs_create_link(&(slave->dev.kobj), &(master->dev.kobj),
                                 "master");
         if (ret)
                 return ret;
         /* next, create a link from the master to the slave */
         sprintf(linkname,"slave_%s",slave->name);
-        ret = sysfs_create_link(&(master->class_dev.kobj), &(slave->class_dev.kobj),
+        ret = sysfs_create_link(&(master->dev.kobj), &(slave->dev.kobj),
                                 linkname);
         return ret;
 
@@ -217,20 +216,21 @@ void bond_destroy_slave_symlinks(struct net_device *master, struct net_device *s
 {
         char linkname[IFNAMSIZ+7];
 
-        sysfs_remove_link(&(slave->class_dev.kobj), "master");
+        sysfs_remove_link(&(slave->dev.kobj), "master");
         sprintf(linkname,"slave_%s",slave->name);
-        sysfs_remove_link(&(master->class_dev.kobj), linkname);
+        sysfs_remove_link(&(master->dev.kobj), linkname);
 }
 
 
 /*
  * Show the slaves in the current bond.
  */
-static ssize_t bonding_show_slaves(struct class_device *cd, char *buf)
+static ssize_t bonding_show_slaves(struct device *d,
+                                   struct device_attribute *attr, char *buf)
 {
         struct slave *slave;
         int i, res = 0;
-        struct bonding *bond = to_bond(cd);
+        struct bonding *bond = to_bond(d);
 
         read_lock_bh(&bond->lock);
         bond_for_each_slave(bond, slave, i) {
@@ -254,14 +254,16 @@ static ssize_t bonding_show_slaves(struct class_device *cd, char *buf)
  * up for this to succeed.
  * This function is largely the same flow as bonding_update_bonds().
  */
-static ssize_t bonding_store_slaves(struct class_device *cd, const char *buffer, size_t count)
+static ssize_t bonding_store_slaves(struct device *d,
+                                    struct device_attribute *attr,
+                                    const char *buffer, size_t count)
 {
         char command[IFNAMSIZ + 1] = { 0, };
         char *ifname;
         int i, res, found, ret = count;
         struct slave *slave;
         struct net_device *dev = NULL;
-        struct bonding *bond = to_bond(cd);
+        struct bonding *bond = to_bond(d);
 
         /* Quick sanity check -- is the bond interface up? */
         if (!(bond->dev->flags & IFF_UP)) {
@@ -387,25 +389,28 @@ out:
         return ret;
 }
 
-static CLASS_DEVICE_ATTR(slaves, S_IRUGO | S_IWUSR, bonding_show_slaves, bonding_store_slaves);
+static DEVICE_ATTR(slaves, S_IRUGO | S_IWUSR, bonding_show_slaves, bonding_store_slaves);
 
 /*
  * Show and set the bonding mode.  The bond interface must be down to
  * change the mode.
  */
-static ssize_t bonding_show_mode(struct class_device *cd, char *buf)
+static ssize_t bonding_show_mode(struct device *d,
+                                 struct device_attribute *attr, char *buf)
 {
-        struct bonding *bond = to_bond(cd);
+        struct bonding *bond = to_bond(d);
 
         return sprintf(buf, "%s %d\n",
                         bond_mode_tbl[bond->params.mode].modename,
                         bond->params.mode) + 1;
 }
 
-static ssize_t bonding_store_mode(struct class_device *cd, const char *buf, size_t count)
+static ssize_t bonding_store_mode(struct device *d,
+                                  struct device_attribute *attr,
+                                  const char *buf, size_t count)
 {
         int new_value, ret = count;
-        struct bonding *bond = to_bond(cd);
+        struct bonding *bond = to_bond(d);
 
         if (bond->dev->flags & IFF_UP) {
                 printk(KERN_ERR DRV_NAME
@@ -438,16 +443,18 @@ static ssize_t bonding_store_mode(struct class_device *cd, const char *buf, size
 out:
         return ret;
 }
-static CLASS_DEVICE_ATTR(mode, S_IRUGO | S_IWUSR, bonding_show_mode, bonding_store_mode);
+static DEVICE_ATTR(mode, S_IRUGO | S_IWUSR, bonding_show_mode, bonding_store_mode);
 
 /*
  * Show and set the bonding transmit hash method.  The bond interface must be down to
  * change the xmit hash policy.
  */
-static ssize_t bonding_show_xmit_hash(struct class_device *cd, char *buf)
+static ssize_t bonding_show_xmit_hash(struct device *d,
+                                      struct device_attribute *attr,
+                                      char *buf)
 {
         int count;
-        struct bonding *bond = to_bond(cd);
+        struct bonding *bond = to_bond(d);
 
         if ((bond->params.mode != BOND_MODE_XOR) &&
             (bond->params.mode != BOND_MODE_8023AD)) {
@@ -462,10 +469,12 @@ static ssize_t bonding_show_xmit_hash(struct class_device *cd, char *buf)
         return count;
 }
 
-static ssize_t bonding_store_xmit_hash(struct class_device *cd, const char *buf, size_t count)
+static ssize_t bonding_store_xmit_hash(struct device *d,
+                                       struct device_attribute *attr,
+                                       const char *buf, size_t count)
 {
         int new_value, ret = count;
-        struct bonding *bond = to_bond(cd);
+        struct bonding *bond = to_bond(d);
 
         if (bond->dev->flags & IFF_UP) {
                 printk(KERN_ERR DRV_NAME
@@ -501,24 +510,28 @@ static ssize_t bonding_store_xmit_hash(struct class_device *cd, const char *buf,
 out:
         return ret;
 }
-static CLASS_DEVICE_ATTR(xmit_hash_policy, S_IRUGO | S_IWUSR, bonding_show_xmit_hash, bonding_store_xmit_hash);
+static DEVICE_ATTR(xmit_hash_policy, S_IRUGO | S_IWUSR, bonding_show_xmit_hash, bonding_store_xmit_hash);
 
 /*
  * Show and set arp_validate.
  */
-static ssize_t bonding_show_arp_validate(struct class_device *cd, char *buf)
+static ssize_t bonding_show_arp_validate(struct device *d,
+                                         struct device_attribute *attr,
+                                         char *buf)
 {
-        struct bonding *bond = to_bond(cd);
+        struct bonding *bond = to_bond(d);
 
         return sprintf(buf, "%s %d\n",
                        arp_validate_tbl[bond->params.arp_validate].modename,
                        bond->params.arp_validate) + 1;
 }
 
-static ssize_t bonding_store_arp_validate(struct class_device *cd, const char *buf, size_t count)
+static ssize_t bonding_store_arp_validate(struct device *d,
+                                          struct device_attribute *attr,
+                                          const char *buf, size_t count)
 {
         int new_value;
-        struct bonding *bond = to_bond(cd);
+        struct bonding *bond = to_bond(d);
 
         new_value = bond_parse_parm((char *)buf, arp_validate_tbl);
         if (new_value < 0) {
@@ -548,7 +561,7 @@ static ssize_t bonding_store_arp_validate(struct class_device *cd, const char *b
         return count;
 }
 
-static CLASS_DEVICE_ATTR(arp_validate, S_IRUGO | S_IWUSR, bonding_show_arp_validate, bonding_store_arp_validate);
+static DEVICE_ATTR(arp_validate, S_IRUGO | S_IWUSR, bonding_show_arp_validate, bonding_store_arp_validate);
 
 /*
  * Show and set the arp timer interval.  There are two tricky bits
@@ -556,17 +569,21 @@ static CLASS_DEVICE_ATTR(arp_validate, S_IRUGO | S_IWUSR, bonding_show_arp_valid
  * MII monitoring.  Second, if the ARP timer isn't running, we must
  * start it.
  */
-static ssize_t bonding_show_arp_interval(struct class_device *cd, char *buf)
+static ssize_t bonding_show_arp_interval(struct device *d,
+                                         struct device_attribute *attr,
+                                         char *buf)
 {
-        struct bonding *bond = to_bond(cd);
+        struct bonding *bond = to_bond(d);
 
         return sprintf(buf, "%d\n", bond->params.arp_interval) + 1;
 }
 
-static ssize_t bonding_store_arp_interval(struct class_device *cd, const char *buf, size_t count)
+static ssize_t bonding_store_arp_interval(struct device *d,
+                                          struct device_attribute *attr,
+                                          const char *buf, size_t count)
 {
         int new_value, ret = count;
-        struct bonding *bond = to_bond(cd);
+        struct bonding *bond = to_bond(d);
 
         if (sscanf(buf, "%d", &new_value) != 1) {
                 printk(KERN_ERR DRV_NAME
@@ -638,15 +655,17 @@ static ssize_t bonding_store_arp_interval(struct class_device *cd, const char *b
 out:
         return ret;
 }
-static CLASS_DEVICE_ATTR(arp_interval, S_IRUGO | S_IWUSR , bonding_show_arp_interval, bonding_store_arp_interval);
+static DEVICE_ATTR(arp_interval, S_IRUGO | S_IWUSR , bonding_show_arp_interval, bonding_store_arp_interval);
 
 /*
  * Show and set the arp targets.
  */
-static ssize_t bonding_show_arp_targets(struct class_device *cd, char *buf)
+static ssize_t bonding_show_arp_targets(struct device *d,
+                                        struct device_attribute *attr,
+                                        char *buf)
 {
         int i, res = 0;
-        struct bonding *bond = to_bond(cd);
+        struct bonding *bond = to_bond(d);
 
         for (i = 0; i < BOND_MAX_ARP_TARGETS; i++) {
                 if (bond->params.arp_targets[i])
@@ -660,11 +679,13 @@ static ssize_t bonding_show_arp_targets(struct class_device *cd, char *buf)
         return res;
 }
 
-static ssize_t bonding_store_arp_targets(struct class_device *cd, const char *buf, size_t count)
+static ssize_t bonding_store_arp_targets(struct device *d,
+                                         struct device_attribute *attr,
+                                         const char *buf, size_t count)
 {
         u32 newtarget;
         int i = 0, done = 0, ret = count;
-        struct bonding *bond = to_bond(cd);
+        struct bonding *bond = to_bond(d);
         u32 *targets;
 
         targets = bond->params.arp_targets;
@@ -742,24 +763,28 @@ static ssize_t bonding_store_arp_targets(struct class_device *cd, const char *bu
 out:
         return ret;
 }
-static CLASS_DEVICE_ATTR(arp_ip_target, S_IRUGO | S_IWUSR , bonding_show_arp_targets, bonding_store_arp_targets);
+static DEVICE_ATTR(arp_ip_target, S_IRUGO | S_IWUSR , bonding_show_arp_targets, bonding_store_arp_targets);
 
 /*
  * Show and set the up and down delays.  These must be multiples of the
  * MII monitoring value, and are stored internally as the multiplier.
  * Thus, we must translate to MS for the real world.
  */
-static ssize_t bonding_show_downdelay(struct class_device *cd, char *buf)
+static ssize_t bonding_show_downdelay(struct device *d,
+                                      struct device_attribute *attr,
+                                      char *buf)
 {
-        struct bonding *bond = to_bond(cd);
+        struct bonding *bond = to_bond(d);
 
         return sprintf(buf, "%d\n", bond->params.downdelay * bond->params.miimon) + 1;
 }
 
-static ssize_t bonding_store_downdelay(struct class_device *cd, const char *buf, size_t count)
+static ssize_t bonding_store_downdelay(struct device *d,
+                                       struct device_attribute *attr,
+                                       const char *buf, size_t count)
 {
         int new_value, ret = count;
-        struct bonding *bond = to_bond(cd);
+        struct bonding *bond = to_bond(d);
 
         if (!(bond->params.miimon)) {
                 printk(KERN_ERR DRV_NAME
@@ -800,20 +825,24 @@ static ssize_t bonding_store_downdelay(struct class_device *cd, const char *buf,
 out:
         return ret;
 }
-static CLASS_DEVICE_ATTR(downdelay, S_IRUGO | S_IWUSR , bonding_show_downdelay, bonding_store_downdelay);
+static DEVICE_ATTR(downdelay, S_IRUGO | S_IWUSR , bonding_show_downdelay, bonding_store_downdelay);
 
-static ssize_t bonding_show_updelay(struct class_device *cd, char *buf)
+static ssize_t bonding_show_updelay(struct device *d,
+                                    struct device_attribute *attr,
+                                    char *buf)
 {
-        struct bonding *bond = to_bond(cd);
+        struct bonding *bond = to_bond(d);
 
         return sprintf(buf, "%d\n", bond->params.updelay * bond->params.miimon) + 1;
 
 }
 
-static ssize_t bonding_store_updelay(struct class_device *cd, const char *buf, size_t count)
+static ssize_t bonding_store_updelay(struct device *d,
+                                     struct device_attribute *attr,
+                                     const char *buf, size_t count)
 {
         int new_value, ret = count;
-        struct bonding *bond = to_bond(cd);
+        struct bonding *bond = to_bond(d);
 
         if (!(bond->params.miimon)) {
                 printk(KERN_ERR DRV_NAME
@@ -854,25 +883,29 @@ static ssize_t bonding_store_updelay(struct class_device *cd, const char *buf, s
 out:
         return ret;
 }
-static CLASS_DEVICE_ATTR(updelay, S_IRUGO | S_IWUSR , bonding_show_updelay, bonding_store_updelay);
+static DEVICE_ATTR(updelay, S_IRUGO | S_IWUSR , bonding_show_updelay, bonding_store_updelay);
 
 /*
  * Show and set the LACP interval.  Interface must be down, and the mode
  * must be set to 802.3ad mode.
  */
-static ssize_t bonding_show_lacp(struct class_device *cd, char *buf)
+static ssize_t bonding_show_lacp(struct device *d,
+                                 struct device_attribute *attr,
+                                 char *buf)
 {
-        struct bonding *bond = to_bond(cd);
+        struct bonding *bond = to_bond(d);
 
         return sprintf(buf, "%s %d\n",
                 bond_lacp_tbl[bond->params.lacp_fast].modename,
                 bond->params.lacp_fast) + 1;
 }
 
-static ssize_t bonding_store_lacp(struct class_device *cd, const char *buf, size_t count)
+static ssize_t bonding_store_lacp(struct device *d,
+                                  struct device_attribute *attr,
+                                  const char *buf, size_t count)
 {
         int new_value, ret = count;
-        struct bonding *bond = to_bond(cd);
+        struct bonding *bond = to_bond(d);
 
         if (bond->dev->flags & IFF_UP) {
                 printk(KERN_ERR DRV_NAME
@@ -906,7 +939,7 @@ static ssize_t bonding_store_lacp(struct class_device *cd, const char *buf, size
 out:
         return ret;
 }
-static CLASS_DEVICE_ATTR(lacp_rate, S_IRUGO | S_IWUSR, bonding_show_lacp, bonding_store_lacp);
+static DEVICE_ATTR(lacp_rate, S_IRUGO | S_IWUSR, bonding_show_lacp, bonding_store_lacp);
 
 /*
  * Show and set the MII monitor interval.  There are two tricky bits
@@ -914,17 +947,21 @@ static CLASS_DEVICE_ATTR(lacp_rate, S_IRUGO | S_IWUSR, bonding_show_lacp, bondin
  * ARP monitoring.  Second, if the timer isn't running, we must
  * start it.
  */
-static ssize_t bonding_show_miimon(struct class_device *cd, char *buf)
+static ssize_t bonding_show_miimon(struct device *d,
+                                   struct device_attribute *attr,
+                                   char *buf)
 {
-        struct bonding *bond = to_bond(cd);
+        struct bonding *bond = to_bond(d);
 
         return sprintf(buf, "%d\n", bond->params.miimon) + 1;
 }
 
-static ssize_t bonding_store_miimon(struct class_device *cd, const char *buf, size_t count)
+static ssize_t bonding_store_miimon(struct device *d,
+                                    struct device_attribute *attr,
+                                    const char *buf, size_t count)
 {
         int new_value, ret = count;
-        struct bonding *bond = to_bond(cd);
+        struct bonding *bond = to_bond(d);
 
         if (sscanf(buf, "%d", &new_value) != 1) {
                 printk(KERN_ERR DRV_NAME
@@ -1000,7 +1037,7 @@ static ssize_t bonding_store_miimon(struct class_device *cd, const char *buf, si
 out:
         return ret;
 }
-static CLASS_DEVICE_ATTR(miimon, S_IRUGO | S_IWUSR, bonding_show_miimon, bonding_store_miimon);
+static DEVICE_ATTR(miimon, S_IRUGO | S_IWUSR, bonding_show_miimon, bonding_store_miimon);
 
 /*
  * Show and set the primary slave.  The store function is much
@@ -1009,10 +1046,12 @@ static CLASS_DEVICE_ATTR(miimon, S_IRUGO | S_IWUSR, bonding_show_miimon, bonding
  * The bond must be a mode that supports a primary for this be
  * set.
  */
-static ssize_t bonding_show_primary(struct class_device *cd, char *buf)
+static ssize_t bonding_show_primary(struct device *d,
+                                    struct device_attribute *attr,
+                                    char *buf)
 {
         int count = 0;
-        struct bonding *bond = to_bond(cd);
+        struct bonding *bond = to_bond(d);
 
         if (bond->primary_slave)
                 count = sprintf(buf, "%s\n", bond->primary_slave->dev->name) + 1;
@@ -1022,11 +1061,13 @@ static ssize_t bonding_show_primary(struct class_device *cd, char *buf)
         return count;
 }
 
-static ssize_t bonding_store_primary(struct class_device *cd, const char *buf, size_t count)
+static ssize_t bonding_store_primary(struct device *d,
+                                     struct device_attribute *attr,
+                                     const char *buf, size_t count)
 {
         int i;
         struct slave *slave;
-        struct bonding *bond = to_bond(cd);
+        struct bonding *bond = to_bond(d);
 
         write_lock_bh(&bond->lock);
         if (!USES_PRIMARY(bond->params.mode)) {
@@ -1065,22 +1106,26 @@ out:
         write_unlock_bh(&bond->lock);
         return count;
 }
-static CLASS_DEVICE_ATTR(primary, S_IRUGO | S_IWUSR, bonding_show_primary, bonding_store_primary);
+static DEVICE_ATTR(primary, S_IRUGO | S_IWUSR, bonding_show_primary, bonding_store_primary);
 
 /*
  * Show and set the use_carrier flag.
  */
-static ssize_t bonding_show_carrier(struct class_device *cd, char *buf)
+static ssize_t bonding_show_carrier(struct device *d,
+                                    struct device_attribute *attr,
+                                    char *buf)
 {
-        struct bonding *bond = to_bond(cd);
+        struct bonding *bond = to_bond(d);
 
         return sprintf(buf, "%d\n", bond->params.use_carrier) + 1;
 }
 
-static ssize_t bonding_store_carrier(struct class_device *cd, const char *buf, size_t count)
+static ssize_t bonding_store_carrier(struct device *d,
+                                     struct device_attribute *attr,
+                                     const char *buf, size_t count)
 {
         int new_value, ret = count;
-        struct bonding *bond = to_bond(cd);
+        struct bonding *bond = to_bond(d);
 
 
         if (sscanf(buf, "%d", &new_value) != 1) {
@@ -1102,16 +1147,18 @@ static ssize_t bonding_store_carrier(struct class_device *cd, const char *buf, s
 out:
         return count;
 }
-static CLASS_DEVICE_ATTR(use_carrier, S_IRUGO | S_IWUSR, bonding_show_carrier, bonding_store_carrier);
+static DEVICE_ATTR(use_carrier, S_IRUGO | S_IWUSR, bonding_show_carrier, bonding_store_carrier);
 
 
 /*
  * Show and set currently active_slave.
  */
-static ssize_t bonding_show_active_slave(struct class_device *cd, char *buf)
+static ssize_t bonding_show_active_slave(struct device *d,
+                                         struct device_attribute *attr,
+                                         char *buf)
 {
         struct slave *curr;
-        struct bonding *bond = to_bond(cd);
+        struct bonding *bond = to_bond(d);
         int count;
 
 
@@ -1126,13 +1173,15 @@ static ssize_t bonding_show_active_slave(struct class_device *cd, char *buf)
         return count;
 }
 
-static ssize_t bonding_store_active_slave(struct class_device *cd, const char *buf, size_t count)
+static ssize_t bonding_store_active_slave(struct device *d,
+                                          struct device_attribute *attr,
+                                          const char *buf, size_t count)
 {
         int i;
         struct slave *slave;
         struct slave *old_active = NULL;
         struct slave *new_active = NULL;
-        struct bonding *bond = to_bond(cd);
+        struct bonding *bond = to_bond(d);
 
         write_lock_bh(&bond->lock);
         if (!USES_PRIMARY(bond->params.mode)) {
@@ -1194,16 +1243,18 @@ out:
         return count;
 
 }
-static CLASS_DEVICE_ATTR(active_slave, S_IRUGO | S_IWUSR, bonding_show_active_slave, bonding_store_active_slave);
+static DEVICE_ATTR(active_slave, S_IRUGO | S_IWUSR, bonding_show_active_slave, bonding_store_active_slave);
 
 
 /*
  * Show link status of the bond interface.
  */
-static ssize_t bonding_show_mii_status(struct class_device *cd, char *buf)
+static ssize_t bonding_show_mii_status(struct device *d,
+                                       struct device_attribute *attr,
+                                       char *buf)
 {
         struct slave *curr;
-        struct bonding *bond = to_bond(cd);
+        struct bonding *bond = to_bond(d);
 
         read_lock(&bond->curr_slave_lock);
         curr = bond->curr_active_slave;
@@ -1211,16 +1262,18 @@ static ssize_t bonding_show_mii_status(struct class_device *cd, char *buf)
 
         return sprintf(buf, "%s\n", (curr) ? "up" : "down") + 1;
 }
-static CLASS_DEVICE_ATTR(mii_status, S_IRUGO, bonding_show_mii_status, NULL);
+static DEVICE_ATTR(mii_status, S_IRUGO, bonding_show_mii_status, NULL);
 
 
 /*
  * Show current 802.3ad aggregator ID.
  */
-static ssize_t bonding_show_ad_aggregator(struct class_device *cd, char *buf)
+static ssize_t bonding_show_ad_aggregator(struct device *d,
+                                          struct device_attribute *attr,
+                                          char *buf)
 {
         int count = 0;
-        struct bonding *bond = to_bond(cd);
+        struct bonding *bond = to_bond(d);
 
         if (bond->params.mode == BOND_MODE_8023AD) {
                 struct ad_info ad_info;
@@ -1231,16 +1284,18 @@ static ssize_t bonding_show_ad_aggregator(struct class_device *cd, char *buf)
 
         return count;
 }
-static CLASS_DEVICE_ATTR(ad_aggregator, S_IRUGO, bonding_show_ad_aggregator, NULL);
+static DEVICE_ATTR(ad_aggregator, S_IRUGO, bonding_show_ad_aggregator, NULL);
 
 
 /*
  * Show number of active 802.3ad ports.
  */
-static ssize_t bonding_show_ad_num_ports(struct class_device *cd, char *buf)
+static ssize_t bonding_show_ad_num_ports(struct device *d,
+                                         struct device_attribute *attr,
+                                         char *buf)
 {
         int count = 0;
-        struct bonding *bond = to_bond(cd);
+        struct bonding *bond = to_bond(d);
 
         if (bond->params.mode == BOND_MODE_8023AD) {
                 struct ad_info ad_info;
@@ -1251,16 +1306,18 @@ static ssize_t bonding_show_ad_num_ports(struct class_device *cd, char *buf)
 
         return count;
 }
-static CLASS_DEVICE_ATTR(ad_num_ports, S_IRUGO, bonding_show_ad_num_ports, NULL);
+static DEVICE_ATTR(ad_num_ports, S_IRUGO, bonding_show_ad_num_ports, NULL);
 
 
 /*
  * Show current 802.3ad actor key.
  */
-static ssize_t bonding_show_ad_actor_key(struct class_device *cd, char *buf)
+static ssize_t bonding_show_ad_actor_key(struct device *d,
+                                         struct device_attribute *attr,
+                                         char *buf)
 {
         int count = 0;
-        struct bonding *bond = to_bond(cd);
+        struct bonding *bond = to_bond(d);
 
         if (bond->params.mode == BOND_MODE_8023AD) {
                 struct ad_info ad_info;
@@ -1271,16 +1328,18 @@ static ssize_t bonding_show_ad_actor_key(struct class_device *cd, char *buf)
 
         return count;
 }
-static CLASS_DEVICE_ATTR(ad_actor_key, S_IRUGO, bonding_show_ad_actor_key, NULL);
+static DEVICE_ATTR(ad_actor_key, S_IRUGO, bonding_show_ad_actor_key, NULL);
 
 
 /*
  * Show current 802.3ad partner key.
  */
-static ssize_t bonding_show_ad_partner_key(struct class_device *cd, char *buf)
+static ssize_t bonding_show_ad_partner_key(struct device *d,
+                                           struct device_attribute *attr,
+                                           char *buf)
 {
         int count = 0;
-        struct bonding *bond = to_bond(cd);
+        struct bonding *bond = to_bond(d);
 
         if (bond->params.mode == BOND_MODE_8023AD) {
                 struct ad_info ad_info;
@@ -1291,16 +1350,18 @@ static ssize_t bonding_show_ad_partner_key(struct class_device *cd, char *buf)
 
         return count;
 }
-static CLASS_DEVICE_ATTR(ad_partner_key, S_IRUGO, bonding_show_ad_partner_key, NULL);
+static DEVICE_ATTR(ad_partner_key, S_IRUGO, bonding_show_ad_partner_key, NULL);
 
 
 /*
  * Show current 802.3ad partner mac.
  */
-static ssize_t bonding_show_ad_partner_mac(struct class_device *cd, char *buf)
+static ssize_t bonding_show_ad_partner_mac(struct device *d,
+                                           struct device_attribute *attr,
+                                           char *buf)
 {
         int count = 0;
-        struct bonding *bond = to_bond(cd);
+        struct bonding *bond = to_bond(d);
 
         if (bond->params.mode == BOND_MODE_8023AD) {
                 struct ad_info ad_info;
@@ -1319,30 +1380,30 @@ static ssize_t bonding_show_ad_partner_mac(struct class_device *cd, char *buf)
 
         return count;
 }
-static CLASS_DEVICE_ATTR(ad_partner_mac, S_IRUGO, bonding_show_ad_partner_mac, NULL);
+static DEVICE_ATTR(ad_partner_mac, S_IRUGO, bonding_show_ad_partner_mac, NULL);
 
 
 
 static struct attribute *per_bond_attrs[] = {
-        &class_device_attr_slaves.attr,
-        &class_device_attr_mode.attr,
-        &class_device_attr_arp_validate.attr,
-        &class_device_attr_arp_interval.attr,
-        &class_device_attr_arp_ip_target.attr,
-        &class_device_attr_downdelay.attr,
-        &class_device_attr_updelay.attr,
-        &class_device_attr_lacp_rate.attr,
-        &class_device_attr_xmit_hash_policy.attr,
-        &class_device_attr_miimon.attr,
-        &class_device_attr_primary.attr,
-        &class_device_attr_use_carrier.attr,
-        &class_device_attr_active_slave.attr,
-        &class_device_attr_mii_status.attr,
-        &class_device_attr_ad_aggregator.attr,
-        &class_device_attr_ad_num_ports.attr,
-        &class_device_attr_ad_actor_key.attr,
-        &class_device_attr_ad_partner_key.attr,
-        &class_device_attr_ad_partner_mac.attr,
+        &dev_attr_slaves.attr,
+        &dev_attr_mode.attr,
+        &dev_attr_arp_validate.attr,
+        &dev_attr_arp_interval.attr,
+        &dev_attr_arp_ip_target.attr,
+        &dev_attr_downdelay.attr,
+        &dev_attr_updelay.attr,
+        &dev_attr_lacp_rate.attr,
+        &dev_attr_xmit_hash_policy.attr,
+        &dev_attr_miimon.attr,
+        &dev_attr_primary.attr,
+        &dev_attr_use_carrier.attr,
+        &dev_attr_active_slave.attr,
+        &dev_attr_mii_status.attr,
+        &dev_attr_ad_aggregator.attr,
+        &dev_attr_ad_num_ports.attr,
+        &dev_attr_ad_actor_key.attr,
+        &dev_attr_ad_partner_key.attr,
+        &dev_attr_ad_partner_mac.attr,
         NULL,
 };
 
@@ -1367,7 +1428,7 @@ int bond_create_sysfs(void)
         if (!firstbond)
                 return -ENODEV;
 
-        netdev_class = firstbond->dev->class_dev.class;
+        netdev_class = firstbond->dev->dev.class;
         if (!netdev_class)
                 return -ENODEV;
 
@@ -1410,13 +1471,13 @@ int bond_create_sysfs_entry(struct bonding *bond)
         struct net_device *dev = bond->dev;
         int err;
 
-        err = sysfs_create_group(&(dev->class_dev.kobj), &bonding_group);
+        err = sysfs_create_group(&(dev->dev.kobj), &bonding_group);
         if (err) {
                 printk(KERN_EMERG "eek! didn't create group!\n");
         }
 
         if (expected_refcount < 1)
-                expected_refcount = atomic_read(&bond->dev->class_dev.kobj.kref.refcount);
+                expected_refcount = atomic_read(&bond->dev->dev.kobj.kref.refcount);
 
         return err;
 }
@@ -1427,6 +1488,6 @@ void bond_destroy_sysfs_entry(struct bonding *bond)
 {
         struct net_device *dev = bond->dev;
 
-        sysfs_remove_group(&(dev->class_dev.kobj), &bonding_group);
+        sysfs_remove_group(&(dev->dev.kobj), &bonding_group);
 }
 
diff --git a/drivers/net/iseries_veth.c b/drivers/net/iseries_veth.c
index 2194b567239f..0e9ba3c3faf7 100644
--- a/drivers/net/iseries_veth.c
+++ b/drivers/net/iseries_veth.c
@@ -1102,7 +1102,7 @@ static struct net_device * __init veth_probe_one(int vlan,
         }
 
         kobject_init(&port->kobject);
-        port->kobject.parent = &dev->class_dev.kobj;
+        port->kobject.parent = &dev->dev.kobj;
         port->kobject.ktype  = &veth_port_ktype;
         kobject_set_name(&port->kobject, "veth_port");
         if (0 != kobject_add(&port->kobject))
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index 5eb7a3536f29..e67361e2bf5d 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -27,8 +27,6 @@
 
 #include "macb.h"
 
-#define to_net_dev(class) container_of(class, struct net_device, class_dev)
-
 #define RX_BUFFER_SIZE          128
 #define RX_RING_SIZE            512
 #define RX_RING_BYTES           (sizeof(struct dma_desc) * RX_RING_SIZE)
@@ -945,10 +943,10 @@ static int macb_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
         return ret;
 }
 
-static ssize_t macb_mii_show(const struct class_device *cd, char *buf,
+static ssize_t macb_mii_show(const struct device *_dev, char *buf,
                         unsigned long addr)
 {
-        struct net_device *dev = to_net_dev(cd);
+        struct net_device *dev = to_net_dev(_dev);
         struct macb *bp = netdev_priv(dev);
         ssize_t ret = -EINVAL;
 
@@ -962,11 +960,13 @@ static ssize_t macb_mii_show(const struct class_device *cd, char *buf,
 }
 
 #define MII_ENTRY(name, addr)                                   \
-static ssize_t show_##name(struct class_device *cd, char *buf)  \
+static ssize_t show_##name(struct device *_dev,                 \
+                           struct device_attribute *attr,       \
+                           char *buf)                           \
 {                                                               \
-        return macb_mii_show(cd, buf, addr);                    \
+        return macb_mii_show(_dev, buf, addr);                  \
 }                                                               \
-static CLASS_DEVICE_ATTR(name, S_IRUGO, show_##name, NULL)
+static DEVICE_ATTR(name, S_IRUGO, show_##name, NULL)
 
 MII_ENTRY(bmcr, MII_BMCR);
 MII_ENTRY(bmsr, MII_BMSR);
@@ -977,13 +977,13 @@ MII_ENTRY(lpa, MII_LPA);
 MII_ENTRY(expansion, MII_EXPANSION);
 
 static struct attribute *macb_mii_attrs[] = {
-        &class_device_attr_bmcr.attr,
-        &class_device_attr_bmsr.attr,
-        &class_device_attr_physid1.attr,
-        &class_device_attr_physid2.attr,
-        &class_device_attr_advertise.attr,
-        &class_device_attr_lpa.attr,
-        &class_device_attr_expansion.attr,
+        &dev_attr_bmcr.attr,
+        &dev_attr_bmsr.attr,
+        &dev_attr_physid1.attr,
+        &dev_attr_physid2.attr,
+        &dev_attr_advertise.attr,
+        &dev_attr_lpa.attr,
+        &dev_attr_expansion.attr,
         NULL,
 };
 
@@ -994,17 +994,17 @@ static struct attribute_group macb_mii_group = {
 
 static void macb_unregister_sysfs(struct net_device *net)
 {
-        struct class_device *class_dev = &net->class_dev;
+        struct device *_dev = &net->dev;
 
-        sysfs_remove_group(&class_dev->kobj, &macb_mii_group);
+        sysfs_remove_group(&_dev->kobj, &macb_mii_group);
 }
 
 static int macb_register_sysfs(struct net_device *net)
 {
-        struct class_device *class_dev = &net->class_dev;
+        struct device *_dev = &net->dev;
         int ret;
 
-        ret = sysfs_create_group(&class_dev->kobj, &macb_mii_group);
+        ret = sysfs_create_group(&_dev->kobj, &macb_mii_group);
         if (ret)
                 printk(KERN_WARNING
                        "%s: sysfs mii attribute registration failed: %d\n",
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index 43af61438449..c95614131980 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -1659,7 +1659,7 @@ smc911x_ethtool_getdrvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
 {
         strncpy(info->driver, CARDNAME, sizeof(info->driver));
         strncpy(info->version, version, sizeof(info->version));
-        strncpy(info->bus_info, dev->class_dev.dev->bus_id, sizeof(info->bus_info));
+        strncpy(info->bus_info, dev->dev.parent->bus_id, sizeof(info->bus_info));
 }
 
 static int smc911x_ethtool_nwayreset(struct net_device *dev)
diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c
index e62a9586fb95..49f4b7712ebf 100644
--- a/drivers/net/smc91x.c
+++ b/drivers/net/smc91x.c
@@ -1712,7 +1712,7 @@ smc_ethtool_getdrvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
 {
         strncpy(info->driver, CARDNAME, sizeof(info->driver));
         strncpy(info->version, version, sizeof(info->version));
-        strncpy(info->bus_info, dev->class_dev.dev->bus_id, sizeof(info->bus_info));
+        strncpy(info->bus_info, dev->dev.parent->bus_id, sizeof(info->bus_info));
 }
 
 static int smc_ethtool_nwayreset(struct net_device *dev)
diff --git a/drivers/net/wireless/hostap/hostap_main.c b/drivers/net/wireless/hostap/hostap_main.c
index 04c19cefa1da..9077e6edde34 100644
--- a/drivers/net/wireless/hostap/hostap_main.c
+++ b/drivers/net/wireless/hostap/hostap_main.c
@@ -84,7 +84,7 @@ struct net_device * hostap_add_interface(struct local_info *local,
         if (strchr(dev->name, '%'))
                 ret = dev_alloc_name(dev, dev->name);
 
-        SET_NETDEV_DEV(dev, mdev->class_dev.dev);
+        SET_NETDEV_DEV(dev, mdev->dev.parent);
         if (ret >= 0)
                 ret = register_netdevice(dev);
 
diff --git a/drivers/net/wireless/orinoco.c b/drivers/net/wireless/orinoco.c
index 2a65bb93de26..4e7f6cf51436 100644
--- a/drivers/net/wireless/orinoco.c
+++ b/drivers/net/wireless/orinoco.c
@@ -4293,8 +4293,8 @@ static void orinoco_get_drvinfo(struct net_device *dev,
         strncpy(info->driver, DRIVER_NAME, sizeof(info->driver) - 1);
         strncpy(info->version, DRIVER_VERSION, sizeof(info->version) - 1);
         strncpy(info->fw_version, priv->fw_name, sizeof(info->fw_version) - 1);
-        if (dev->class_dev.dev)
-                strncpy(info->bus_info, dev->class_dev.dev->bus_id,
+        if (dev->dev.parent)
+                strncpy(info->bus_info, dev->dev.parent->bus_id,
                         sizeof(info->bus_info) - 1);
         else
                 snprintf(info->bus_info, sizeof(info->bus_info) - 1,
diff --git a/drivers/net/wireless/orinoco_cs.c b/drivers/net/wireless/orinoco_cs.c
index d08ae8d2726c..d1e502236b2a 100644
--- a/drivers/net/wireless/orinoco_cs.c
+++ b/drivers/net/wireless/orinoco_cs.c
@@ -332,7 +332,7 @@ orinoco_cs_config(struct pcmcia_device *link)
 
         /* Finally, report what we've done */
         printk(KERN_DEBUG "%s: " DRIVER_NAME " at %s, irq %d, io "
-               "0x%04x-0x%04x\n", dev->name, dev->class_dev.dev->bus_id,
+               "0x%04x-0x%04x\n", dev->name, dev->dev.parent->bus_id,
                link->irq.AssignedIRQ, link->io.BasePort1,
                link->io.BasePort1 + link->io.NumPorts1 - 1);
 
diff --git a/drivers/net/wireless/spectrum_cs.c b/drivers/net/wireless/spectrum_cs.c
index cf2d1486b01d..af70460f008a 100644
--- a/drivers/net/wireless/spectrum_cs.c
+++ b/drivers/net/wireless/spectrum_cs.c
@@ -806,7 +806,7 @@ spectrum_cs_config(struct pcmcia_device *link)
 
         /* Finally, report what we've done */
         printk(KERN_DEBUG "%s: " DRIVER_NAME " at %s, irq %d, io "
-               "0x%04x-0x%04x\n", dev->name, dev->class_dev.dev->bus_id,
+               "0x%04x-0x%04x\n", dev->name, dev->dev.parent->bus_id,
                link->irq.AssignedIRQ, link->io.BasePort1,
                link->io.BasePort1 + link->io.NumPorts1 - 1);