Merge branch 'bonding-next'

Veaceslav Falico says:

====================
bonding: convert pr_* to netdev_*

Currently bonding uses pr_info/warn/etc. function to print something, while
it's encouraged to use netdev_info/warn/etc. in net/.

This patchset converts them where possible (i.e. where we have a working
net_device). Also, convert pr_ratelimit* to net_() and remove the pr_fmt,
to unify netdev_* and pr_* outputs.
====================

CC: Jay Vosburgh <j.vosburgh@gmail.com>
CC: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: Veaceslav Falico <vfalico@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

7 files changed, 373 insertions, 431 deletions

diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c
index 0dfeaf5da3f2..ee2c73a9de39 100644
--- a/drivers/net/bonding/bond_3ad.c
+++ b/drivers/net/bonding/bond_3ad.c
@@ -20,8 +20,6 @@
  *
  */
 
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
 #include <linux/skbuff.h>
 #include <linux/if_ether.h>
 #include <linux/netdevice.h>
@@ -301,8 +299,8 @@ static u16 __get_link_speed(struct port *port)
                 }
         }
 
-        pr_debug("Port %d Received link speed %d update from adapter\n",
-                 port->actor_port_number, speed);
+        netdev_dbg(slave->bond->dev, "Port %d Received link speed %d update from adapter\n",
+                   port->actor_port_number, speed);
         return speed;
 }
 
@@ -329,14 +327,14 @@ static u8 __get_duplex(struct port *port)
                 switch (slave->duplex) {
                 case DUPLEX_FULL:
                         retval = 0x1;
-                        pr_debug("Port %d Received status full duplex update from adapter\n",
-                                 port->actor_port_number);
+                        netdev_dbg(slave->bond->dev, "Port %d Received status full duplex update from adapter\n",
+                                   port->actor_port_number);
                         break;
                 case DUPLEX_HALF:
                 default:
                         retval = 0x0;
-                        pr_debug("Port %d Received status NOT full duplex update from adapter\n",
-                                 port->actor_port_number);
+                        netdev_dbg(slave->bond->dev, "Port %d Received status NOT full duplex update from adapter\n",
+                                   port->actor_port_number);
                         break;
                 }
         }
@@ -1079,9 +1077,8 @@ static void ad_rx_machine(struct lacpdu *lacpdu, struct port *port)
                         /* detect loopback situation */
                         if (MAC_ADDRESS_EQUAL(&(lacpdu->actor_system),
                                               &(port->actor_system))) {
-                                pr_err("%s: An illegal loopback occurred on adapter (%s)\n"
+                                netdev_err(port->slave->bond->dev, "An illegal loopback occurred on adapter (%s)\n"
                                        "Check the configuration to verify that all adapters are connected to 802.3ad compliant switch ports\n",
-                                       port->slave->bond->dev->name,
                                        port->slave->dev->name);
                                 return;
                         }
@@ -1269,9 +1266,9 @@ static void ad_port_selection_logic(struct port *port)
                                 port->next_port_in_aggregator = NULL;
                                 port->actor_port_aggregator_identifier = 0;
 
-                                pr_debug("Port %d left LAG %d\n",
-                                         port->actor_port_number,
-                                         temp_aggregator->aggregator_identifier);
+                                netdev_dbg(bond->dev, "Port %d left LAG %d\n",
+                                           port->actor_port_number,
+                                           temp_aggregator->aggregator_identifier);
                                 /* if the aggregator is empty, clear its
                                  * parameters, and set it ready to be attached
                                  */
@@ -1284,11 +1281,11 @@ static void ad_port_selection_logic(struct port *port)
                         /* meaning: the port was related to an aggregator
                          * but was not on the aggregator port list
                          */
-                        pr_warn_ratelimited("%s: Warning: Port %d (on %s) was related to aggregator %d but was not on its port list\n",
-                                            port->slave->bond->dev->name,
-                                            port->actor_port_number,
-                                            port->slave->dev->name,
-                                            port->aggregator->aggregator_identifier);
+                        net_warn_ratelimited("%s: Warning: Port %d (on %s) was related to aggregator %d but was not on its port list\n",
+                                             port->slave->bond->dev->name,
+                                             port->actor_port_number,
+                                             port->slave->dev->name,
+                                             port->aggregator->aggregator_identifier);
                 }
         }
         /* search on all aggregators for a suitable aggregator for this port */
@@ -1318,9 +1315,9 @@ static void ad_port_selection_logic(struct port *port)
                         port->next_port_in_aggregator = aggregator->lag_ports;
                         port->aggregator->num_of_ports++;
                         aggregator->lag_ports = port;
-                        pr_debug("Port %d joined LAG %d(existing LAG)\n",
-                                 port->actor_port_number,
-                                 port->aggregator->aggregator_identifier);
+                        netdev_dbg(bond->dev, "Port %d joined LAG %d(existing LAG)\n",
+                                   port->actor_port_number,
+                                   port->aggregator->aggregator_identifier);
 
                         /* mark this port as selected */
                         port->sm_vars |= AD_PORT_SELECTED;
@@ -1363,12 +1360,11 @@ static void ad_port_selection_logic(struct port *port)
                         /* mark this port as selected */
                         port->sm_vars |= AD_PORT_SELECTED;
 
-                        pr_debug("Port %d joined LAG %d(new LAG)\n",
-                                 port->actor_port_number,
-                                 port->aggregator->aggregator_identifier);
+                        netdev_dbg(bond->dev, "Port %d joined LAG %d(new LAG)\n",
+                                   port->actor_port_number,
+                                   port->aggregator->aggregator_identifier);
                 } else {
-                        pr_err("%s: Port %d (on %s) did not find a suitable aggregator\n",
-                               port->slave->bond->dev->name,
+                        netdev_err(bond->dev, "Port %d (on %s) did not find a suitable aggregator\n",
                                port->actor_port_number, port->slave->dev->name);
                 }
         }
@@ -1445,9 +1441,9 @@ static struct aggregator *ad_agg_selection_test(struct aggregator *best,
                 break;
 
         default:
-                pr_warn_ratelimited("%s: Impossible agg select mode %d\n",
-                                    curr->slave->bond->dev->name,
-                                    __get_agg_selection_mode(curr->lag_ports));
+                net_warn_ratelimited("%s: Impossible agg select mode %d\n",
+                                     curr->slave->bond->dev->name,
+                                     __get_agg_selection_mode(curr->lag_ports));
                 break;
         }
 
@@ -1539,40 +1535,40 @@ static void ad_agg_selection_logic(struct aggregator *agg)
 
         /* if there is new best aggregator, activate it */
         if (best) {
-                pr_debug("best Agg=%d; P=%d; a k=%d; p k=%d; Ind=%d; Act=%d\n",
-                         best->aggregator_identifier, best->num_of_ports,
-                         best->actor_oper_aggregator_key,
-                         best->partner_oper_aggregator_key,
-                         best->is_individual, best->is_active);
-                pr_debug("best ports %p slave %p %s\n",
-                         best->lag_ports, best->slave,
-                         best->slave ? best->slave->dev->name : "NULL");
+                netdev_dbg(bond->dev, "best Agg=%d; P=%d; a k=%d; p k=%d; Ind=%d; Act=%d\n",
+                           best->aggregator_identifier, best->num_of_ports,
+                           best->actor_oper_aggregator_key,
+                           best->partner_oper_aggregator_key,
+                           best->is_individual, best->is_active);
+                netdev_dbg(bond->dev, "best ports %p slave %p %s\n",
+                           best->lag_ports, best->slave,
+                           best->slave ? best->slave->dev-&