1 files changed, 175 insertions, 149 deletions

diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c
index 72357597fa1b..ecb20208f67c 100644
--- a/drivers/net/bonding/bond_sysfs.c
+++ b/drivers/net/bonding/bond_sysfs.c
@@ -1,4 +1,3 @@
-
 /*
  * Copyright(c) 2004-2005 Intel Corporation. All rights reserved.
  *
@@ -38,7 +37,7 @@
 
 #include "bonding.h"
 
-#define to_dev(obj)     container_of(obj,struct device,kobj)
+#define to_dev(obj)     container_of(obj, struct device, kobj)
 #define to_bond(cd)     ((struct bonding *)(netdev_priv(to_net_dev(cd))))
 
 /*---------------------------- Declarations -------------------------------*/
@@ -83,7 +82,8 @@ static ssize_t bonding_show_bonds(struct class *cls, char *buf)
  *
  */
 
-static ssize_t bonding_store_bonds(struct class *cls, const char *buffer, size_t count)
+static ssize_t bonding_store_bonds(struct class *cls,
+                                   const char *buffer, size_t count)
 {
         char command[IFNAMSIZ + 1] = {0, };
         char *ifname;
@@ -97,11 +97,11 @@ static ssize_t bonding_store_bonds(struct class *cls, const char *buffer, size_t
                 goto err_no_cmd;
 
         if (command[0] == '+') {
-                printk(KERN_INFO DRV_NAME
+                pr_info(DRV_NAME
                         ": %s is being created...\n", ifname);
                 rv = bond_create(ifname);
                 if (rv) {
-                        printk(KERN_INFO DRV_NAME ": Bond creation failed.\n");
+                        pr_info(DRV_NAME ": Bond creation failed.\n");
                         res = rv;
                 }
                 goto out;
@@ -118,28 +118,28 @@ static ssize_t bonding_store_bonds(struct class *cls, const char *buffer, size_t
                                  */
                                 if (atomic_read(&bond->dev->dev.kobj.kref.refcount)
                                                         > expected_refcount){
-                                        printk(KERN_INFO DRV_NAME
+                                        pr_info(DRV_NAME
                                                 ": Unable remove bond %s due to open references.\n",
                                                 ifname);
                                         res = -EPERM;
                                         goto out_unlock;
                                 }
-                                printk(KERN_INFO DRV_NAME
+                                pr_info(DRV_NAME
                                         ": %s is being deleted...\n",
                                         bond->dev->name);
                                 unregister_netdevice(bond->dev);
                                 goto out_unlock;
                         }
 
-                printk(KERN_ERR DRV_NAME
+                pr_err(DRV_NAME
                         ": unable to delete non-existent bond %s\n", ifname);
                 res = -ENODEV;
                 goto out_unlock;
         }
 
 err_no_cmd:
-        printk(KERN_ERR DRV_NAME
-                ": no command found in bonding_masters. Use +ifname or -ifname.\n");
+        pr_err(DRV_NAME ": no command found in bonding_masters."
+               " Use +ifname or -ifname.\n");
         return -EPERM;
 
 out_unlock:
@@ -155,7 +155,8 @@ out:
 static CLASS_ATTR(bonding_masters,  S_IWUSR | S_IRUGO,
                   bonding_show_bonds, bonding_store_bonds);
 
-int bond_create_slave_symlinks(struct net_device *master, struct net_device *slave)
+int bond_create_slave_symlinks(struct net_device *master,
+                               struct net_device *slave)
 {
         char linkname[IFNAMSIZ+7];
         int ret = 0;
@@ -166,19 +167,20 @@ int bond_create_slave_symlinks(struct net_device *master, struct net_device *sla
         if (ret)
                 return ret;
         /* next, create a link from the master to the slave */
-        sprintf(linkname,"slave_%s",slave->name);
+        sprintf(linkname, "slave_%s", slave->name);
         ret = sysfs_create_link(&(master->dev.kobj), &(slave->dev.kobj),
                                 linkname);
         return ret;
 
 }
 
-void bond_destroy_slave_symlinks(struct net_device *master, struct net_device *slave)
+void bond_destroy_slave_symlinks(struct net_device *master,
+                                 struct net_device *slave)
 {
         char linkname[IFNAMSIZ+7];
 
         sysfs_remove_link(&(slave->dev.kobj), "master");
-        sprintf(linkname,"slave_%s",slave->name);
+        sprintf(linkname, "slave_%s", slave->name);
         sysfs_remove_link(&(master->dev.kobj), linkname);
 }
 
@@ -252,7 +254,7 @@ static ssize_t bonding_store_slaves(struct device *d,
                 read_lock(&bond->lock);
                 bond_for_each_slave(bond, slave, i)
                         if (strnicmp(slave->dev->name, ifname, IFNAMSIZ) == 0) {
-                                printk(KERN_ERR DRV_NAME
+                                pr_err(DRV_NAME
                                        ": %s: Interface %s is already enslaved!\n",
                                        bond->dev->name, ifname);
                                 ret = -EPERM;
@@ -261,21 +263,20 @@ static ssize_t bonding_store_slaves(struct device *d,
                         }
 
                 read_unlock(&bond->lock);
-                printk(KERN_INFO DRV_NAME ": %s: Adding slave %s.\n",
+                pr_info(DRV_NAME ": %s: Adding slave %s.\n",
                        bond->dev->name, ifname);
                 dev = dev_get_by_name(&init_net, ifname);
                 if (!dev) {
-                        printk(KERN_INFO DRV_NAME
+                        pr_info(DRV_NAME
                                ": %s: Interface %s does not exist!\n",
                                bond->dev->name, ifname);
                         ret = -EPERM;
                         goto out;
-                }
-                else
+                } else
                         dev_put(dev);
 
                 if (dev->flags & IFF_UP) {
-                        printk(KERN_ERR DRV_NAME
+                        pr_err(DRV_NAME
                                ": %s: Error: Unable to enslave %s "
                                "because it is already up.\n",
                                bond->dev->name, dev->name);
@@ -302,9 +303,9 @@ static ssize_t bonding_store_slaves(struct device *d,
                 bond_for_each_slave(bond, slave, i)
                         if (strnicmp(slave->dev->name, ifname, IFNAMSIZ) == 0)
                                 slave->original_mtu = original_mtu;
-                if (res) {
+                if (res)
                         ret = res;
-                }
+
                 goto out;
         }
 
@@ -318,7 +319,7 @@ static ssize_t bonding_store_slaves(struct device *d,
                                 break;
                         }
                 if (dev) {
-                        printk(KERN_INFO DRV_NAME ": %s: Removing slave %s\n",
+                        pr_info(DRV_NAME ": %s: Removing slave %s\n",
                                 bond->dev->name, dev->name);
                                 res = bond_release(bond->dev, dev);
                         if (res) {
@@ -327,9 +328,9 @@ static ssize_t bonding_store_slaves(struct device *d,
                         }
                         /* set the slave MTU to the default */
                         dev_set_mtu(dev, original_mtu);
-                }
-                else {
-                        printk(KERN_ERR DRV_NAME ": unable to remove non-existent slave %s for bond %s.\n",
+                } else {
+                        pr_err(DRV_NAME ": unable to remove non-existent"
+                               " slave %s for bond %s.\n",
                                 ifname, bond->dev->name);
                         ret = -ENODEV;
                 }
@@ -337,7 +338,7 @@ static ssize_t bonding_store_slaves(struct device *d,
         }
 
 err_no_cmd:
-        printk(KERN_ERR DRV_NAME ": no command found in slaves file for bond %s. Use +ifname or -ifname.\n", bond->dev->name);
+        pr_err(DRV_NAME ": no command found in slaves file for bond %s. Use +ifname or -ifname.\n", bond->dev->name);
         ret = -EPERM;
 
 out:
@@ -345,7 +346,8 @@ out:
         return ret;
 }
 
-static 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
@@ -369,16 +371,15 @@ static ssize_t bonding_store_mode(struct device *d,
         struct bonding *bond = to_bond(d);
 
         if (bond->dev->flags & IFF_UP) {
-                printk(KERN_ERR DRV_NAME
-                       ": unable to update mode of %s because interface is up.\n",
-                       bond->dev->name);
+                pr_err(DRV_NAME ": unable to update mode of %s"
+                       " because interface is up.\n", bond->dev->name);
                 ret = -EPERM;
                 goto out;
         }
 
         new_value = bond_parse_parm(buf, bond_mode_tbl);
         if (new_value < 0)  {
-                printk(KERN_ERR DRV_NAME
+                pr_err(DRV_NAME
                        ": %s: Ignoring invalid mode value %.*s.\n",
                        bond->dev->name,
                        (int)strlen(buf) - 1, buf);
@@ -393,17 +394,19 @@ static ssize_t bonding_store_mode(struct device *d,
 
                 bond->params.mode = new_value;
                 bond_set_mode_ops(bond, bond->params.mode);
-                printk(KERN_INFO DRV_NAME ": %s: setting mode to %s (%d).\n",
-                        bond->dev->name, bond_mode_tbl[new_value].modename, new_value);
+                pr_info(DRV_NAME ": %s: setting mode to %s (%d).\n",
+                       bond->dev->name, bond_mode_tbl[new_value].modename,
+                       new_value);
         }
 out:
         return ret;
 }
-static 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.
+ * 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 device *d,
                                       struct device_attribute *attr,
@@ -424,7 +427,7 @@ static ssize_t bonding_store_xmit_hash(struct device *d,
         struct bonding *bond = to_bond(d);
 
         if (bond->dev->flags & IFF_UP) {
-                printk(KERN_ERR DRV_NAME
+                pr_err(DRV_NAME
                        "%s: Interface is up. Unable to update xmit policy.\n",
                        bond->dev->name);
                 ret = -EPERM;
@@ -433,7 +436,7 @@ static ssize_t bonding_store_xmit_hash(struct device *d,
 
         new_value = bond_parse_parm(buf, xmit_hashtype_tbl);
         if (new_value < 0)  {
-                printk(KERN_ERR DRV_NAME
+                pr_err(DRV_NAME
                        ": %s: Ignoring invalid xmit hash policy value %.*s.\n",
                        bond->dev->name,
                        (int)strlen(buf) - 1, buf);
@@ -442,13 +445,15 @@ static ssize_t bonding_store_xmit_hash(struct device *d,
         } else {
                 bond->params.xmit_policy = new_value;
                 bond_set_mode_ops(bond, bond->params.mode);
-                printk(KERN_INFO DRV_NAME ": %s: setting xmit hash policy to %s (%d).\n",
-                        bond->dev->name, xmit_hashtype_tbl[new_value].modename, new_value);
+                pr_info(DRV_NAME ": %s: setting xmit hash policy to %s (%d).\n",
+                        bond->dev->name,
+                        xmit_hashtype_tbl[new_value].modename, new_value);
         }
 out:
         return ret;
 }
-static 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.
@@ -473,39 +478,41 @@ static ssize_t bonding_store_arp_validate(struct device *d,
 
         new_value = bond_parse_parm(buf, arp_validate_tbl);
         if (new_value < 0) {
-                printk(KERN_ERR DRV_NAME
+                pr_err(DRV_NAME
                        ": %s: Ignoring invalid arp_validate value %s\n",
                        bond->dev->name, buf);
                 return -EINVAL;
         }
         if (new_value && (bond->params.mode != BOND_MODE_ACTIVEBACKUP)) {
-                printk(KERN_ERR DRV_NAME
+                pr_err(DRV_NAME
                        ": %s: arp_validate only supported in active-backup mode.\n",
                        bond->dev->name);
                 return -EINVAL;
         }
-        printk(KERN_INFO DRV_NAME ": %s: setting arp_validate to %s (%d).\n",
+        pr_info(DRV_NAME ": %s: setting arp_validate to %s (%d).\n",
                bond->dev->name, arp_validate_tbl[new_value].modename,
                new_value);
 
-        if (!bond->params.arp_validate && new_value) {
+        if (!bond->params.arp_validate && new_value)
                 bond_register_arp(bond);
-        } else if (bond->params.arp_validate && !new_value) {
+        else if (bond->params.arp_validate && !new_value)
                 bond_unregister_arp(bond);
-        }
 
         bond->params.arp_validate = new_value;
 
         return count;
 }
 
-static 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 store fail_over_mac.  User only allowed to change the
  * value when there are no slaves.
  */
-static ssize_t bonding_show_fail_over_mac(struct device *d, struct device_attribute *attr, char *buf)
+static ssize_t bonding_show_fail_over_mac(struct device *d,
+                                          struct device_attribute *attr,
+                                          char *buf)
 {
         struct bonding *bond = to_bond(d);
 
@@ -514,13 +521,15 @@ static ssize_t bonding_show_fail_over_mac(struct device *d, struct device_attrib
                        bond->params.fail_over_mac);
 }
 
-static ssize_t bonding_store_fail_over_mac(struct device *d, struct device_attribute *attr, const char *buf, size_t count)
+static ssize_t bonding_store_fail_over_mac(struct device *d,
+                                           struct device_attribute *attr,
+                                           const char *buf, size_t count)
 {
         int new_value;
         struct bonding *bond = to_bond(d);
 
         if (bond->slave_cnt != 0) {
-                printk(KERN_ERR DRV_NAME
+                pr_err(DRV_NAME
                        ": %s: Can't alter fail_over_mac with slaves in bond.\n",
                        bond->dev->name);
                 return -EPERM;
@@ -528,21 +537,22 @@ static ssize_t bonding_store_fail_over_mac(struct device *d, struct device_attri
 
         new_value = bond_parse_parm(buf, fail_over_mac_tbl);
         if (new_value < 0) {
-                printk(KERN_ERR DRV_NAME
+                pr_err(DRV_NAME
                        ": %s: Ignoring invalid fail_over_mac value %s.\n",
                        bond->dev->name, buf);
                 return -EINVAL;
         }
 
         bond->params.fail_over_mac = new_value;
-        printk(KERN_INFO DRV_NAME ": %s: Setting fail_over_mac to %s (%d).\n",
+        pr_info(DRV_NAME ": %s: Setting fail_over_mac to %s (%d).\n",
                bond->dev->name, fail_over_mac_tbl[new_value].modename,
                new_value);
 
         return count;
 }
 
-static DEVICE_ATTR(fail_over_mac, S_IRUGO | S_IWUSR, bonding_show_fail_over_mac, bonding_store_fail_over_mac);
+static DEVICE_ATTR(fail_over_mac, S_IRUGO | S_IWUSR,
+                   bonding_show_fail_over_mac, bonding_store_fail_over_mac);
 
 /*
  * Show and set the arp timer interval.  There are two tricky bits
@@ -567,28 +577,28 @@ static ssize_t bonding_store_arp_interval(struct device *d,
         struct bonding *bond = to_bond(d);
 
         if (sscanf(buf, "%d", &new_value) != 1) {
-                printk(KERN_ERR DRV_NAME
+                pr_err(DRV_NAME
                        ": %s: no arp_interval value specified.\n",
                        bond->dev->name);
                 ret = -EINVAL;
                 goto out;
         }
         if (new_value < 0) {
-                printk(KERN_ERR DRV_NAME
+                pr_err(DRV_NAME
                        ": %s: Invalid arp_interval value %d not in range 1-%d; rejected.\n",
                        bond->dev->name, new_value, INT_MAX);
                 ret = -EINVAL;
                 goto out;
         }
 
-        printk(KERN_INFO DRV_NAME
+        pr_info(DRV_NAME
                ": %s: Setting ARP monitoring interval to %d.\n",
                bond->dev->name, new_value);
         bond->params.arp_interval = new_value;
         if (bond->params.arp_interval)
                 bond->dev->priv_flags |= IFF_MASTER_ARPMON;
         if (bond->params.miimon) {
-                printk(KERN_INFO DRV_NAME
+                pr_info(DRV_NAME
                        ": %s: ARP monitoring cannot be used with MII monitoring. "
                        "%s Disabling MII monitoring.\n",
                        bond->dev->name, bond->dev->name);
@@ -599,7 +609,7 @@ static ssize_t bonding_store_arp_interval(struct device *d,
                 }
         }
         if (!bond->params.arp_targets[0]) {
-                printk(KERN_INFO DRV_NAME
+                pr_info(DRV_NAME
                        ": %s: ARP monitoring has been set up, "
                        "but no ARP targets have been specified.\n",
                        bond->dev->name);
@@ -625,7 +635,8 @@ static ssize_t bonding_store_arp_interval(struct device *d,
 out:
         return ret;
 }
-static 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.
@@ -661,7 +672,7 @@ static ssize_t bonding_store_arp_targets(struct device *d,
         /* look for adds */
         if (buf[0] == '+') {
                 if ((newtarget == 0) || (newtarget == htonl(INADDR_BROADCAST))) {
-                        printk(KERN_ERR DRV_NAME
+                        pr_err(DRV_NAME
                                ": %s: invalid ARP target %pI4 specified for addition\n",
                                bond->dev->name, &newtarget);
                         ret = -EINVAL;
@@ -670,14 +681,14 @@ static ssize_t bonding_store_arp_targets(struct device *d,
                 /* look for an empty slot to put the target in, and check for dupes */
                 for (i = 0; (i < BOND_MAX_ARP_TARGETS) && !done; i++) {
                         if (targets[i] == newtarget) { /* duplicate */
-                                printk(KERN_ERR DRV_NAME
+                                pr_err(DRV_NAME
                                        ": %s: ARP target %pI4 is already present\n",
                                        bond->dev->name, &newtarget);
                                 ret = -EINVAL;
                                 goto out;
                         }
                         if (targets[i] == 0) {
-                                printk(KERN_INFO DRV_NAME
+                                pr_info(DRV_NAME
                                        ": %s: adding ARP target %pI4.\n",
                                        bond->dev->name, &newtarget);
                                 done = 1;
@@ -685,17 +696,16 @@ static ssize_t bonding_store_arp_targets(struct device *d,
                         }
                 }
                 if (!done) {
-                        printk(KERN_ERR DRV_NAME
+                        pr_err(DRV_NAME
                                ": %s: ARP target table is full!\n",
                                bond->dev->name);
                         ret = -EINVAL;
                         goto out;
                 }
 
-        }
-        else if (buf[0] == '-') {
+        } else if (buf[0] == '-')       {
                 if ((newtarget == 0) || (newtarget == htonl(INADDR_BROADCAST))) {
-                        printk(KERN_ERR DRV_NAME
+                        pr_err(DRV_NAME
                                ": %s: invalid ARP target %pI4 specified for removal\n",
                                bond->dev->name, &newtarget);
                         ret = -EINVAL;
@@ -705,7 +715,7 @@ static ssize_t bonding_store_arp_targets(struct device *d,
                 for (i = 0; (i < BOND_MAX_ARP_TARGETS) && !done; i++) {
                         if (targets[i] == newtarget) {
                                 int j;
-                                printk(KERN_INFO DRV_NAME
+                                pr_info(DRV_NAME
                                        ": %s: removing ARP target %pI4.\n",
                                        bond->dev->name, &newtarget);
                                 for (j = i; (j < (BOND_MAX_ARP_TARGETS-1)) && targets[j+1]; j++)
@@ -716,15 +726,15 @@ static ssize_t bonding_store_arp_targets(struct device *d,
                         }
                 }
                 if (!done) {
-                        printk(KERN_INFO DRV_NAME
+                        pr_info(DRV_NAME
                                ": %s: unable to remove nonexistent ARP target %pI4.\n",
                                bond->dev->name, &newtarget);
                         ret = -EINVAL;
                         goto out;
                 }
-        }
-        else {
-                printk(KERN_ERR DRV_NAME ": no command found in arp_ip_targets file for bond %s. Use +<addr> or -<addr>.\n",
+        } else {
+                pr_err(DRV_NAME ": no command found in arp_ip_targets file"
+                       " for bond %s. Use +<addr> or -<addr>.\n",
                         bond->dev->name);
                 ret = -EPERM;
                 goto out;
@@ -757,7 +767,7 @@ static ssize_t bonding_store_downdelay(struct device *d,
         struct bonding *bond = to_bond(d);
 
         if (!(bond->params.miimon)) {
-                printk(KERN_ERR DRV_NAME
+                pr_err(DRV_NAME
                        ": %s: Unable to set down delay as MII monitoring is disabled\n",
                        bond->dev->name);
                 ret = -EPERM;
@@ -765,14 +775,14 @@ static ssize_t bonding_store_downdelay(struct device *d,
         }
 
         if (sscanf(buf, "%d", &new_value) != 1) {
-                printk(KERN_ERR DRV_NAME
+                pr_err(DRV_NAME
                        ": %s: no down delay value specified.\n",
                        bond->dev->name);
                 ret = -EINVAL;
                 goto out;
         }
         if (new_value < 0) {
-                printk(KERN_ERR DRV_NAME
+                pr_err(DRV_NAME
                        ": %s: Invalid down delay value %d not in range %d-%d; rejected.\n",
                        bond->dev->name, new_value, 1, INT_MAX);
                 ret = -EINVAL;
@@ -787,15 +797,17 @@ static ssize_t bonding_store_downdelay(struct device *d,
                                bond->params.miimon);
                 }
                 bond->params.downdelay = new_value / bond->params.miimon;
-                printk(KERN_INFO DRV_NAME ": %s: Setting down delay to %d.\n",
-                       bond->dev->name, bond->params.downdelay * bond->params.miimon);
+                pr_info(DRV_NAME ": %s: Setting down delay to %d.\n",
+                       bond->dev->name,
+                       bond->params.downdelay * bond->params.miimon);
 
         }
 
 out:
         return ret;
 }
-static 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 device *d,
                                     struct device_attribute *attr,
@@ -815,7 +827,7 @@ static ssize_t bonding_store_updelay(struct device *d,
         struct bonding *bond = to_bond(d);
 
         if (!(bond->params.miimon)) {
-                printk(KERN_ERR DRV_NAME
+                pr_err(DRV_NAME
                        ": %s: Unable to set up delay as MII monitoring is disabled\n",
                        bond->dev->name);
                 ret = -EPERM;
@@ -823,14 +835,14 @@ static ssize_t bonding_store_updelay(struct device *d,
         }
 
         if (sscanf(buf, "%d", &new_value) != 1) {
-                printk(KERN_ERR DRV_NAME
+                pr_err(DRV_NAME
                        ": %s: no up delay value specified.\n",
                        bond->dev->name);
                 ret = -EINVAL;
                 goto out;
         }
         if (new_value < 0) {
-                printk(KERN_ERR DRV_NAME
+                pr_err(DRV_NAME
                        ": %s: Invalid down delay value %d not in range %d-%d; rejected.\n",
                        bond->dev->name, new_value, 1, INT_MAX);
                 ret = -EINVAL;
@@ -845,7 +857,7 @@ static ssize_t bonding_store_updelay(struct device *d,
                                bond->params.miimon);
                 }
                 bond->params.updelay = new_value / bond->params.miimon;
-                printk(KERN_INFO DRV_NAME ": %s: Setting up delay to %d.\n",
+                pr_info(DRV_NAME ": %s: Setting up delay to %d.\n",
                        bond->dev->name, bond->params.updelay * bond->params.miimon);
 
         }
@@ -853,7 +865,8 @@ static ssize_t bonding_store_updelay(struct device *d,
 out:
         return ret;
 }
-static 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
@@ -878,7 +891,7 @@ static ssize_t bonding_store_lacp(struct device *d,
         struct bonding *bond = to_bond(d);
 
         if (bond->dev->flags & IFF_UP) {
-                printk(KERN_ERR DRV_NAME
+                pr_err(DRV_NAME
                        ": %s: Unable to update LACP rate because interface is up.\n",
                        bond->dev->name);
                 ret = -EPERM;
@@ -886,7 +899,7 @@ static ssize_t bonding_store_lacp(struct device *d,
         }
 
         if (bond->params.mode != BOND_MODE_8023AD) {
-                printk(KERN_ERR DRV_NAME
+                pr_err(DRV_NAME
                        ": %s: Unable to update LACP rate because bond is not in 802.3ad mode.\n",
                        bond->dev->name);
                 ret = -EPERM;
@@ -897,19 +910,20 @@ static ssize_t bonding_store_lacp(struct device *d,
 
         if ((new_value == 1) || (new_value == 0)) {
                 bond->params.lacp_fast = new_value;
-                printk(KERN_INFO DRV_NAME
-                       ": %s: Setting LACP rate to %s (%d).\n",
-                       bond->dev->name, bond_lacp_tbl[new_value].modename, new_value);
+                pr_info(DRV_NAME ": %s: Setting LACP rate to %s (%d).\n",
+                        bond->dev->name, bond_lacp_tbl[new_value].modename,
+                        new_value);
         } else {
-                printk(KERN_ERR DRV_NAME
+                pr_err(DRV_NAME
                        ": %s: Ignoring invalid LACP rate value %.*s.\n",
-                        bond->dev->name, (int)strlen(buf) - 1, buf);
+                       bond->dev->name, (int)strlen(buf) - 1, buf);
                 ret = -EINVAL;
         }
 out:
         return ret;
 }
-static 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);
 
 static ssize_t bonding_show_ad_select(struct device *d,
                                       struct device_attribute *attr,
@@ -931,7 +945,7 @@ static ssize_t bonding_store_ad_select(struct device *d,
         struct bonding *bond = to_bond(d);
 
         if (bond->dev->flags & IFF_UP) {
-                printk(KERN_ERR DRV_NAME
+                pr_err(DRV_NAME
                        ": %s: Unable to update ad_select because interface "
                        "is up.\n", bond->dev->name);
                 ret = -EPERM;
@@ -942,12 +956,12 @@ static ssize_t bonding_store_ad_select(struct device *d,
 
         if (new_value != -1) {
                 bond->params.ad_select = new_value;
-                printk(KERN_INFO DRV_NAME
+                pr_info(DRV_NAME
                        ": %s: Setting ad_select to %s (%d).\n",
                        bond->dev->name, ad_select_tbl[new_value].modename,
                        new_value);
         } else {
-                printk(KERN_ERR DRV_NAME
+                pr_err(DRV_NAME
                        ": %s: Ignoring invalid ad_select value %.*s.\n",
                        bond->dev->name, (int)strlen(buf) - 1, buf);
                 ret = -EINVAL;
@@ -955,8 +969,8 @@ static ssize_t bonding_store_ad_select(struct device *d,
 out:
         return ret;
 }
-
-static DEVICE_ATTR(ad_select, S_IRUGO | S_IWUSR, bonding_show_ad_select, bonding_store_ad_select);
+static DEVICE_ATTR(ad_select, S_IRUGO | S_IWUSR,
+                   bonding_show_ad_select, bonding_store_ad_select);
 
 /*
  * Show and set the number of grat ARP to send after a failover event.
@@ -978,14 +992,14 @@ static ssize_t bonding_store_n_grat_arp(struct device *d,
         struct bonding *bond = to_bond(d);
 
         if (sscanf(buf, "%d", &new_value) != 1) {
-                printk(KERN_ERR DRV_NAME
+                pr_err(DRV_NAME
                        ": %s: no num_grat_arp value specified.\n",
                        bond->dev->name);
                 ret = -EINVAL;
                 goto out;
         }
         if (new_value < 0 || new_value > 255) {
-                printk(KERN_ERR DRV_NAME
+                pr_err(DRV_NAME
                        ": %s: Invalid num_grat_arp value %d not in range 0-255; rejected.\n",
                        bond->dev->name, new_value);
                 ret = -EINVAL;
@@ -996,10 +1010,11 @@ static ssize_t bonding_store_n_grat_arp(struct device *d,
 out:
         return ret;
 }
-static DEVICE_ATTR(num_grat_arp, S_IRUGO | S_IWUSR, bonding_show_n_grat_arp, bonding_store_n_grat_arp);
+static DEVICE_ATTR(num_grat_arp, S_IRUGO | S_IWUSR,
+                   bonding_show_n_grat_arp, bonding_store_n_grat_arp);
 
 /*
- * Show and set the number of unsolicted NA's to send after a failover event.
+ * Show and set the number of unsolicited NA's to send after a failover event.
  */
 static ssize_t bonding_show_n_unsol_na(struct device *d,
                                        struct device_attribute *attr,
@@ -1018,25 +1033,26 @@ static ssize_t bonding_store_n_unsol_na(struct device *d,
         struct bonding *bond = to_bond(d);
 
         if (sscanf(buf, "%d", &new_value) != 1) {
-                printk(KERN_ERR DRV_NAME
+                pr_err(DRV_NAME
                        ": %s: no num_unsol_na value specified.\n",
                        bond->dev->name);
                 ret = -EINVAL;
                 goto out;
         }
+
         if (new_value < 0 || new_value > 255) {
-                printk(KERN_ERR DRV_NAME
+                pr_err(DRV_NAME
                        ": %s: Invalid num_unsol_na value %d not in range 0-255; rejected.\n",
                        bond->dev->name, new_value);
                 ret = -EINVAL;
                 goto out;
-        } else {
+        } else
                 bond->params.num_unsol_na = new_value;
-        }
 out:
         return ret;
 }
-static DEVICE_ATTR(num_unsol_na, S_IRUGO | S_IWUSR, bonding_show_n_unsol_na, bonding_store_n_unsol_na);
+static DEVICE_ATTR(num_unsol_na, S_IRUGO | S_IWUSR,
+                   bonding_show_n_unsol_na, bonding_store_n_unsol_na);
 
 /*
  * Show and set the MII monitor interval.  There are two tricky bits
@@ -1061,37 +1077,37 @@ static ssize_t bonding_store_miimon(struct device *d,
         struct bonding *bond = to_bond(d);
 
         if (sscanf(buf, "%d", &new_value) != 1) {
-                printk(KERN_ERR DRV_NAME
+                pr_err(DRV_NAME
                        ": %s: no miimon value specified.\n",
                        bond->dev->name);
                 ret = -EINVAL;
                 goto out;
         }
         if (new_value < 0) {
-                printk(KERN_ERR DRV_NAME
+                pr_err(DRV_NAME
                        ": %s: Invalid miimon value %d not in range %d-%d; rejected.\n",
                        bond->dev->name, new_value, 1, INT_MAX);
                 ret = -EINVAL;
                 goto out;
         } else {
-                printk(KERN_INFO DRV_NAME
+                pr_info(DRV_NAME
                        ": %s: Setting MII monitoring interval to %d.\n",
                        bond->dev->name, new_value);
                 bond->params.miimon = new_value;
-                if(bond->params.updelay)
-                        printk(KERN_INFO DRV_NAME
+                if (bond->params.updelay)
+                        pr_info(DRV_NAME
                               ": %s: Note: Updating updelay (to %d) "
                               "since it is a multiple of the miimon value.\n",
                               bond->dev->name,
                               bond->params.updelay * bond->params.miimon);
-                if(bond->params.downdelay)
-                        printk(KERN_INFO DRV_NAME
+                if (bond->params.downdelay)
+                        pr_info(DRV_NAME
                               ": %s: Note: Updating downdelay (to %d) "
                               "since it is a multiple of the miimon value.\n",
                               bond->dev->name,
                               bond->params.downdelay * bond->params.miimon);
                 if (bond->params.arp_interval) {
-                        printk(KERN_INFO DRV_NAME
+                        pr_info(DRV_NAME
                                ": %s: MII monitoring cannot be used with "
                                "ARP monitoring. Disabling ARP monitoring...\n",
                                bond->dev->name);
@@ -1125,7 +1141,8 @@ static ssize_t bonding_store_miimon(struct device *d,
 out:
         return ret;
 }
-static 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
@@ -1161,7 +1178,7 @@ static ssize_t bonding_store_primary(struct device *d,
         write_lock_bh(&bond->curr_slave_lock);
 
         if (!USES_PRIMARY(bond->params.mode)) {
-                printk(KERN_INFO DRV_NAME
+                pr_info(DRV_NAME
                        ": %s: Unable to set primary slave; %s is in mode %d\n",
                        bond->dev->name, bond->dev->name, bond->params.mode);
         } else {
@@ -1169,7 +1186,7 @@ static ssize_t bonding_store_primary(struct device *d,
                         if (strnicmp
                             (slave->dev->name, buf,
                              strlen(slave->dev->name)) == 0) {
-                                printk(KERN_INFO DRV_NAME
+                                pr_info(DRV_NAME
                                        ": %s: Setting %s as primary slave.\n",
                                        bond->dev->name, slave->dev->name);
                                 bond->primary_slave = slave;
@@ -1181,13 +1198,13 @@ static ssize_t bonding_store_primary(struct device *d,
                 /* if we got here, then we didn't match the name of any slave */
 
                 if (strlen(buf) == 0 || buf[0] == '\n') {
-                        printk(KERN_INFO DRV_NAME
+                        pr_info(DRV_NAME
                                ": %s: Setting primary slave to None.\n",
                                bond->dev->name);
                         bond->primary_slave = NULL;
                                 bond_select_active_slave(bond);
                 } else {
-                        printk(KERN_INFO DRV_NAME
+                        pr_info(DRV_NAME
                                ": %s: Unable to set %.*s as primary slave as it is not a slave.\n",
                                bond->dev->name, (int)strlen(buf) - 1, buf);
                 }
@@ -1199,7 +1216,8 @@ out:
 
         return count;
 }
-static 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.
@@ -1222,7 +1240,7 @@ static ssize_t bonding_store_carrier(struct device *d,
 
 
         if (sscanf(buf, "%d", &new_value) != 1) {
-                printk(KERN_ERR DRV_NAME
+                pr_err(DRV_NAME
                        ": %s: no use_carrier value specified.\n",
                        bond->dev->name);
                 ret = -EINVAL;
@@ -1230,17 +1248,18 @@ static ssize_t bonding_store_carrier(struct device *d,
         }
         if ((new_value == 0) || (new_value == 1)) {
                 bond->params.use_carrier = new_value;
-                printk(KERN_INFO DRV_NAME ": %s: Setting use_carrier to %d.\n",
+                pr_info(DRV_NAME ": %s: Setting use_carrier to %d.\n",
                        bond->dev->name, new_value);
         } else {
-                printk(KERN_INFO DRV_NAME
+                pr_info(DRV_NAME
                        ": %s: Ignoring invalid use_carrier value %d.\n",
                        bond->dev->name, new_value);
         }
 out:
         return count;
 }
-static 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);
 
 
 /*
@@ -1269,8 +1288,8 @@ static ssize_t bonding_store_active_slave(struct device *d,
 {
         int i;
         struct slave *slave;
-        struct slave *old_active = NULL;
-        struct slave *new_active = NULL;
+        struct slave *old_active = NULL;
+        struct slave *new_active = NULL;
         struct bonding *bond = to_bond(d);
 
         if (!rtnl_trylock())
@@ -1278,11 +1297,11 @@ static ssize_t bonding_store_active_slave(struct device *d,
         read_lock(&bond->lock);
         write_lock_bh(&bond->curr_slave_lock);
 
-        if (!USES_PRIMARY(bond->params.mode)) {
-                printk(KERN_INFO DRV_NAME
-                       ": %s: Unable to change active slave; %s is in mode %d\n",
-                       bond->dev->name, bond->dev->name, bond->params.mode);
-        } else {
+        if (!USES_PRIMARY(bond->params.mode))
+                pr_info(DRV_NAME ": %s: Unable to change active slave;"
+                        " %s is in mode %d\n",
+                        bond->dev->name, bond->dev->name, bond->params.mode);
+        else {
                 bond_for_each_slave(bond, slave, i) {
                         if (strnicmp
                             (slave->dev->name, buf,
@@ -1321,18 +1340,18 @@ static ssize_t bonding_store_active_slave(struct device *d,
                 /* if we got here, then we didn't match the name of any slave */
 
                 if (strlen(buf) == 0 || buf[0] == '\n') {
-                        printk(KERN_INFO DRV_NAME
-                               ": %s: Setting active slave to None.\n",
-                               bond->dev->name);
+                        pr_info(DRV_NAME
+                                ": %s: Setting active slave to None.\n",
+                                bond->dev->name);
                         bond->primary_slave = NULL;
-                                bond_select_active_slave(bond);
+                        bond_select_active_slave(bond);
                 } else {
-                        printk(KERN_INFO DRV_NAME
-                               ": %s: Unable to set %.*s as active slave as it is not a slave.\n",
-                               bond->dev->name, (int)strlen(buf) - 1, buf);
+                        pr_info(DRV_NAME ": %s: Unable to set %.*s"
+                                " as active slave as it is not a slave.\n",
+                                bond->dev->name, (int)strlen(buf) - 1, buf);
                 }
         }
-out:
+ out:
         write_unlock_bh(&bond->curr_slave_lock);
         read_unlock(&bond->lock);
         rtnl_unlock();
@@ -1340,7 +1359,8 @@ out:
         return count;
 
 }
-static 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);
 
 
 /*
@@ -1357,7 +1377,7 @@ static ssize_t bonding_show_mii_status(struct device *d,
         curr = bond->curr_active_slave;
         read_unlock(&bond->curr_slave_lock);
 
-        return sprintf(buf, "%s\n", (curr) ? "up" : "down");
+        return sprintf(buf, "%s\n", curr ? "up" : "down");
 }
 static DEVICE_ATTR(mii_status, S_IRUGO, bonding_show_mii_status, NULL);
 
@@ -1374,7 +1394,9 @@ static ssize_t bonding_show_ad_aggregator(struct device *d,
 
         if (bond->params.mode == BOND_MODE_8023AD) {
                 struct ad_info ad_info;
-                count = sprintf(buf, "%d\n", (bond_3ad_get_active_agg_info(bond, &ad_info)) ?  0 : ad_info.aggregator_id);
+                count = sprintf(buf, "%d\n",
+                                (bond_3ad_get_active_agg_info(bond, &ad_info))
+                                ?  0 : ad_info.aggregator_id);
         }
 
         return count;
@@ -1394,7 +1416,9 @@ static ssize_t bonding_show_ad_num_ports(struct device *d,
 
         if (bond->params.mode == BOND_MODE_8023AD) {
                 struct ad_info ad_info;
-                count = sprintf(buf, "%d\n", (bond_3ad_get_active_agg_info(bond, &ad_info)) ?  0: ad_info.ports);
+                count = sprintf(buf, "%d\n",
+                                (bond_3ad_get_active_agg_info(bond, &ad_info))
+                                ?  0 : ad_info.ports);
         }
 
         return count;
@@ -1414,7 +1438,9 @@ static ssize_t bonding_show_ad_actor_key(struct device *d,
 
         if (bond->params.mode == BOND_MODE_8023AD) {
                 struct ad_info ad_info;
-                count = sprintf(buf, "%d\n", (bond_3ad_get_active_agg_info(bond, &ad_info)) ?  0 : ad_info.actor_key);
+                count = sprintf(buf, "%d\n",
+                                (bond_3ad_get_active_agg_info(bond, &ad_info))
+                                ?  0 : ad_info.actor_key);
         }
 
         return count;
@@ -1434,7 +1460,9 @@ static ssize_t bonding_show_ad_partner_key(struct device *d,
 
         if (bond->params.mode == BOND_MODE_8023AD) {
                 struct ad_info ad_info;
-                count = sprintf(buf, "%d\n", (bond_3ad_get_active_agg_info(bond, &ad_info)) ?  0 : ad_info.partner_key);
+                count = sprintf(buf, "%d\n",
+                                (bond_3ad_get_active_agg_info(bond, &ad_info))
+                                ?  0 : ad_info.partner_key);
         }
 
         return count;
@@ -1454,9 +1482,8 @@ static ssize_t bonding_show_ad_partner_mac(struct device *d,
 
         if (bond->params.mode == BOND_MODE_8023AD) {
                 struct ad_info ad_info;
-                if (!bond_3ad_get_active_agg_info(bond, &ad_info)) {
+                if (!bond_3ad_get_active_agg_info(bond, &ad_info))
                         count = sprintf(buf, "%pM\n", ad_info.partner_system);
-                }
         }
 
         return count;
@@ -1549,9 +1576,8 @@ int bond_create_sysfs_entry(struct bonding *bond)
         int err;
 
         err = sysfs_create_group(&(dev->dev.kobj), &bonding_group);
-        if (err) {
+        if (err)
                 printk(KERN_EMERG "eek! didn't create group!\n");
-        }
 
         if (expected_refcount < 1)
                 expected_refcount = atomic_read(&bond->dev->dev.kobj.kref.refcount);