1 files changed, 50 insertions, 46 deletions

diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c
index be799d2a8a8d..cea5cfe23b71 100644
--- a/drivers/net/bonding/bond_3ad.c
+++ b/drivers/net/bonding/bond_3ad.c
@@ -1124,7 +1124,7 @@ static void ad_rx_machine(struct lacpdu *lacpdu, struct port *port)
                         // detect loopback situation
                         if (!MAC_ADDRESS_COMPARE(&(lacpdu->actor_system), &(port->actor_system))) {
                                 // INFO_RECEIVED_LOOPBACK_FRAMES
-                                printk(KERN_ERR DRV_NAME ": %s: An illegal loopback occurred on "
+                                pr_err(DRV_NAME ": %s: An illegal loopback occurred on "
                                        "adapter (%s). Check the configuration to verify that all "
                                        "Adapters are connected to 802.3ad compliant switch ports\n",
                                        port->slave->dev->master->name, port->slave->dev->name);
@@ -1306,11 +1306,13 @@ static void ad_port_selection_logic(struct port *port)
                         }
                 }
                 if (!curr_port) { // meaning: the port was related to an aggregator but was not on the aggregator port list
-                        printk(KERN_WARNING DRV_NAME ": %s: Warning: Port %d (on %s) was "
-                               "related to aggregator %d but was not on its port list\n",
-                               port->slave->dev->master->name,
-                               port->actor_port_number, port->slave->dev->name,
-                               port->aggregator->aggregator_identifier);
+                        pr_warning(DRV_NAME ": %s: Warning: Port %d (on %s) "
+                                   "was related to aggregator %d but was not "
+                                   "on its port list\n",
+                                   port->slave->dev->master->name,
+                                   port->actor_port_number,
+                                   port->slave->dev->name,
+                                   port->aggregator->aggregator_identifier);
                 }
         }
         // search on all aggregators for a suitable aggregator for this port
@@ -1379,7 +1381,8 @@ static void ad_port_selection_logic(struct port *port)
 
                         pr_debug("Port %d joined LAG %d(new LAG)\n", port->actor_port_number, port->aggregator->aggregator_identifier);
                 } else {
-                        printk(KERN_ERR DRV_NAME ": %s: Port %d (on %s) did not find a suitable aggregator\n",
+                        pr_err(DRV_NAME ": %s: Port %d (on %s) did not find "
+                               "a suitable aggregator\n",
                                port->slave->dev->master->name,
                                port->actor_port_number, port->slave->dev->name);
                 }
@@ -1456,10 +1459,10 @@ static struct aggregator *ad_agg_selection_test(struct aggregator *best,
                 break;
 
         default:
-                printk(KERN_WARNING DRV_NAME
-                       ": %s: Impossible agg select mode %d\n",
-                       curr->slave->dev->master->name,
-                       __get_agg_selection_mode(curr->lag_ports));
+                pr_warning(DRV_NAME
+                           ": %s: Impossible agg select mode %d\n",
+                           curr->slave->dev->master->name,
+                           __get_agg_selection_mode(curr->lag_ports));
                 break;
         }
 
@@ -1562,7 +1565,7 @@ static void ad_agg_selection_logic(struct aggregator *agg)
 
                 // check if any partner replys
                 if (best->is_individual) {
-                        printk(KERN_WARNING DRV_NAME ": %s: Warning: No 802.3ad"
+                        pr_warning(DRV_NAME ": %s: Warning: No 802.3ad"
                                " response from the link partner for any"
                                " adapters in the bond\n",
                                best->slave->dev->master->name);
@@ -1885,7 +1888,8 @@ int bond_3ad_bind_slave(struct slave *slave)
         struct aggregator *aggregator;
 
         if (bond == NULL) {
-                printk(KERN_ERR DRV_NAME ": %s: The slave %s is not attached to its bond\n",
+                pr_err(DRV_NAME ": %s: The slave %s is not attached to "
+                       "its bond\n",
                        slave->dev->master->name, slave->dev->name);
                 return -1;
         }
@@ -1961,9 +1965,9 @@ void bond_3ad_unbind_slave(struct slave *slave)
 
         // if slave is null, the whole port is not initialized
         if (!port->slave) {
-                printk(KERN_WARNING DRV_NAME ": Warning: %s: Trying to "
-                       "unbind an uninitialized port on %s\n",
-                       slave->dev->master->name, slave->dev->name);
+                pr_warning(DRV_NAME ": Warning: %s: Trying to "
+                           "unbind an uninitialized port on %s\n",
+                           slave->dev->master->name, slave->dev->name);
                 return;
         }
 
@@ -1994,8 +1998,8 @@ void bond_3ad_unbind_slave(struct slave *slave)
                                 pr_debug("Some port(s) related to LAG %d - replaceing with LAG %d\n", aggregator->aggregator_identifier, new_aggregator->aggregator_identifier);
 
                                 if ((new_aggregator->lag_ports == port) && new_aggregator->is_active) {
-                                        printk(KERN_INFO DRV_NAME ": %s: Removing an active aggregator\n",
-                                               aggregator->slave->dev->master->name);
+                                        pr_info(DRV_NAME ": %s: Removing an active aggregator\n",
+                                                aggregator->slave->dev->master->name);
                                         // select new active aggregator
                                          select_new_active_agg = 1;
                                 }
@@ -2025,17 +2029,17 @@ void bond_3ad_unbind_slave(struct slave *slave)
                                         ad_agg_selection_logic(__get_first_agg(port));
                                 }
                         } else {
-                                printk(KERN_WARNING DRV_NAME ": %s: Warning: unbinding aggregator, "
-                                       "and could not find a new aggregator for its ports\n",
-                                       slave->dev->master->name);
+                                pr_warning(DRV_NAME ": %s: Warning: unbinding aggregator, "
+                                           "and could not find a new aggregator for its ports\n",
+                                           slave->dev->master->name);
                         }
                 } else { // in case that the only port related to this aggregator is the one we want to remove
                         select_new_active_agg = aggregator->is_active;
                         // clear the aggregator
                         ad_clear_agg(aggregator);
                         if (select_new_active_agg) {
-                                printk(KERN_INFO DRV_NAME ": %s: Removing an active aggregator\n",
-                                       slave->dev->master->name);
+                                pr_info(DRV_NAME ": %s: Removing an active aggregator\n",
+                                        slave->dev->master->name);
                                 // select new active aggregator
                                 ad_agg_selection_logic(__get_first_agg(port));
                         }
@@ -2061,8 +2065,8 @@ void bond_3ad_unbind_slave(struct slave *slave)
                                         // clear the aggregator
                                         ad_clear_agg(temp_aggregator);
                                         if (select_new_active_agg) {
-                                                printk(KERN_INFO DRV_NAME ": %s: Removing an active aggregator\n",
-                                                       slave->dev->master->name);
+                                                pr_info(DRV_NAME ": %s: Removing an active aggregator\n",
+                                                        slave->dev->master->name);
                                                 // select new active aggregator
                                                 ad_agg_selection_logic(__get_first_agg(port));
                                         }
@@ -2110,8 +2114,8 @@ void bond_3ad_state_machine_handler(struct work_struct *work)
                 // select the active aggregator for the bond
                 if ((port = __get_first_port(bond))) {
                         if (!port->slave) {
-                                printk(KERN_WARNING DRV_NAME ": %s: Warning: bond's first port is "
-                                       "uninitialized\n", bond->dev->name);
+                                pr_warning(DRV_NAME ": %s: Warning: bond's first port is "
+                                           "uninitialized\n", bond->dev->name);
                                 goto re_arm;
                         }
 
@@ -2124,8 +2128,8 @@ void bond_3ad_state_machine_handler(struct work_struct *work)
         // for each port run the state machines
         for (port = __get_first_port(bond); port; port = __get_next_port(port)) {
                 if (!port->slave) {
-                        printk(KERN_WARNING DRV_NAME ": %s: Warning: Found an uninitialized "
-                               "port\n", bond->dev->name);
+                        pr_warning(DRV_NAME ": %s: Warning: Found an uninitialized "
+                                   "port\n", bond->dev->name);
                         goto re_arm;
                 }
 
@@ -2166,8 +2170,9 @@ static void bond_3ad_rx_indication(struct lacpdu *lacpdu, struct slave *slave, u
                 port = &(SLAVE_AD_INFO(slave).port);
 
                 if (!port->slave) {
-                        printk(KERN_WARNING DRV_NAME ": %s: Warning: port of slave %s is "
-                               "uninitialized\n", slave->dev->name, slave->dev->master->name);
+                        pr_warning(DRV_NAME ": %s: Warning: port of slave %s "
+                                   "is uninitialized\n",
+                                   slave->dev->name, slave->dev->master->name);
                         return;
                 }
 
@@ -2212,9 +2217,9 @@ void bond_3ad_adapter_speed_changed(struct slave *slave)
 
         // if slave is null, the whole port is not initialized
         if (!port->slave) {
-                printk(KERN_WARNING DRV_NAME ": Warning: %s: speed "
-                       "changed for uninitialized port on %s\n",
-                       slave->dev->master->name, slave->dev->name);
+                pr_warning(DRV_NAME ": Warning: %s: speed "
+                           "changed for uninitialized port on %s\n",
+                           slave->dev->master->name, slave->dev->name);
                 return;
         }
 
@@ -2240,9 +2245,9 @@ void bond_3ad_adapter_duplex_changed(struct slave *slave)
 
         // if slave is null, the whole port is not initialized
         if (!port->slave) {
-                printk(KERN_WARNING DRV_NAME ": %s: Warning: duplex changed "
-                       "for uninitialized port on %s\n",
-                       slave->dev->master->name, slave->dev->name);
+                pr_warning(DRV_NAME ": %s: Warning: duplex changed "
+                           "for uninitialized port on %s\n",
+                           slave->dev->master->name, slave->dev->name);
                 return;
         }
 
@@ -2269,9 +2274,9 @@ void bond_3ad_handle_link_change(struct slave *slave, char link)
 
         // if slave is null, the whole port is not initialized
         if (!port->slave) {
-                printk(KERN_WARNING DRV_NAME ": Warning: %s: link status changed for "
-                       "uninitialized port on %s\n",
-                        slave->dev->master->name, slave->dev->name);
+                pr_warning(DRV_NAME ": Warning: %s: link status changed for "
+                           "uninitialized port on %s\n",
+                           slave->dev->master->name, slave->dev->name);
                 return;
         }
 
@@ -2375,8 +2380,8 @@ int bond_3ad_xmit_xor(struct sk_buff *skb, struct net_device *dev)
         }
 
         if (bond_3ad_get_active_agg_info(bond, &ad_info)) {
-                printk(KERN_DEBUG DRV_NAME ": %s: Error: "
-                       "bond_3ad_get_active_agg_info failed\n", dev->name);
+                pr_debug(DRV_NAME ": %s: Error: "
+                         "bond_3ad_get_active_agg_info failed\n", dev->name);
                 goto out;
         }
 
@@ -2385,9 +2390,8 @@ int bond_3ad_xmit_xor(struct sk_buff *skb, struct net_device *dev)
 
         if (slaves_in_agg == 0) {
                 /*the aggregator is empty*/
-                printk(KERN_DEBUG DRV_NAME ": %s: Error: active "
-                       "aggregator is empty\n",
-                       dev->name);
+                pr_debug(DRV_NAME ": %s: Error: active aggregator is empty\n",
+                         dev->name);
                 goto out;
         }
 
@@ -2405,7 +2409,7 @@ int bond_3ad_xmit_xor(struct sk_buff *skb, struct net_device *dev)
         }
 
         if (slave_agg_no >= 0) {
-                printk(KERN_ERR DRV_NAME ": %s: Error: Couldn't find a slave to tx on "
+                pr_err(DRV_NAME ": %s: Error: Couldn't find a slave to tx on "
                        "for aggregator ID %d\n", dev->name, agg_id);
                 goto out;
         }