net: convert print_mac to %pM

This converts pretty much everything to print_mac. There were
a few things that had conflicts which I have just dropped for
now, no harm done.

I've built an allyesconfig with this and looked at the files
that weren't built very carefully, but it's a huge patch.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 13 insertions, 22 deletions

diff --git a/drivers/net/tokenring/lanstreamer.c b/drivers/net/tokenring/lanstreamer.c
index 59d1673f9387..bd70e818212a 100644
--- a/drivers/net/tokenring/lanstreamer.c
+++ b/drivers/net/tokenring/lanstreamer.c
@@ -446,9 +446,6 @@ static int streamer_reset(struct net_device *dev)
         unsigned int uaa_addr;
         struct sk_buff *skb = NULL;
         __u16 misr;
-#if STREAMER_DEBUG
-        DECLARE_MAC_BUF(mac);
-#endif
 
         streamer_priv = netdev_priv(dev);
         streamer_mmio = streamer_priv->streamer_mmio;
@@ -577,8 +574,7 @@ static int streamer_reset(struct net_device *dev)
                         dev->dev_addr[i+1]= addr & 0xff;
                 }
 #if STREAMER_DEBUG
-                printk("Adapter address: %s\n",
-                       print_mac(mac, dev->dev_addr));
+                printk("Adapter address: %pM\n", dev->dev_addr);
 #endif
         }
         return 0;
@@ -1538,7 +1534,6 @@ static void streamer_arb_cmd(struct net_device *dev)
 
 #if STREAMER_NETWORK_MONITOR
         struct trh_hdr *mac_hdr;
-        DECLARE_MAC_BUF(mac);
 #endif
 
         writew(streamer_priv->arb, streamer_mmio + LAPA);
@@ -1611,11 +1606,11 @@ static void streamer_arb_cmd(struct net_device *dev)
                        dev->name);
                 mac_hdr = tr_hdr(mac_frame);
                 printk(KERN_WARNING
-                       "%s: MAC Frame Dest. Addr: %s\n",
-                       dev->name, print_mac(mac, mac_hdr->daddr));
+                       "%s: MAC Frame Dest. Addr: %pM\n",
+                       dev->name, mac_hdr->daddr);
                 printk(KERN_WARNING
-                       "%s: MAC Frame Srce. Addr: %s\n",
-                       dev->name, DEV->ADDR6(mac_hdr->saddr));
+                       "%s: MAC Frame Srce. Addr: %pM\n",
+                       dev->name, mac_hdr->saddr);
 #endif
                 netif_rx(mac_frame);
 
@@ -1850,8 +1845,6 @@ static int sprintf_info(char *buffer, struct net_device *dev)
         struct streamer_parameters_table spt;
         int size = 0;
         int i;
-        DECLARE_MAC_BUF(mac);
-        DECLARE_MAC_BUF(mac2);
 
         writew(streamer_priv->streamer_addr_table_addr, streamer_mmio + LAPA);
         for (i = 0; i < 14; i += 2) {
@@ -1873,9 +1866,8 @@ static int sprintf_info(char *buffer, struct net_device *dev)
         size = sprintf(buffer, "\n%6s: Adapter Address   : Node Address      : Functional Addr\n", dev->name);
 
         size += sprintf(buffer + size,
-                        "%6s: %s : %s : %02x:%02x:%02x:%02x\n",
-                        dev->name, print_mac(mac, dev->dev_addr),
-                        print_mac(mac2, sat.node_addr),
+                        "%6s: %pM : %pM : %02x:%02x:%02x:%02x\n",
+                        dev->name, dev->dev_addr, sat.node_addr,
                         sat.func_addr[0], sat.func_addr[1],
                         sat.func_addr[2], sat.func_addr[3]);
 
@@ -1884,19 +1876,18 @@ static int sprintf_info(char *buffer, struct net_device *dev)
         size += sprintf(buffer + size, "%6s: Physical Addr : Up Node Address   : Poll Address      : AccPri : Auth Src : Att Code :\n", dev->name);
 
         size += sprintf(buffer + size,
-                    "%6s: %02x:%02x:%02x:%02x   : %s : %s : %04x   : %04x     :  %04x    :\n",
+                    "%6s: %02x:%02x:%02x:%02x   : %pM : %pM : %04x   : %04x     :  %04x    :\n",
                     dev->name, spt.phys_addr[0], spt.phys_addr[1],
                     spt.phys_addr[2], spt.phys_addr[3],
-                    print_mac(mac, spt.up_node_addr),
-                    print_mac(mac2, spt.poll_addr),
+                    spt.up_node_addr, spt.poll_addr,
                     ntohs(spt.acc_priority), ntohs(spt.auth_source_class),
                     ntohs(spt.att_code));
 
         size += sprintf(buffer + size, "%6s: Source Address    : Bcn T : Maj. V : Lan St : Lcl Rg : Mon Err : Frame Correl : \n", dev->name);
 
         size += sprintf(buffer + size,
-                    "%6s: %s : %04x  : %04x   : %04x   : %04x   : %04x    :     %04x     : \n",
-                    dev->name, print_mac(mac, spt.source_addr),
+                    "%6s: %pM : %04x  : %04x   : %04x   : %04x   : %04x    :     %04x     : \n",
+                    dev->name, spt.source_addr,
                     ntohs(spt.beacon_type), ntohs(spt.major_vector),
                     ntohs(spt.lan_status), ntohs(spt.local_ring),
                     ntohs(spt.mon_error), ntohs(spt.frame_correl));
@@ -1905,10 +1896,10 @@ static int sprintf_info(char *buffer, struct net_device *dev)
                     dev->name);
 
         size += sprintf(buffer + size,
-                    "%6s:                :  %02x  :  %02x  : %s : %02x:%02x:%02x:%02x    : \n",
+                    "%6s:                :  %02x  :  %02x  : %pM : %02x:%02x:%02x:%02x    : \n",
                     dev->name, ntohs(spt.beacon_transmit),
                     ntohs(spt.beacon_receive),
-                    print_mac(mac, spt.beacon_naun),
+                    spt.beacon_naun,
                     spt.beacon_phys[0], spt.beacon_phys[1],
                     spt.beacon_phys[2], spt.beacon_phys[3]);
         return size;