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>

7 files changed, 20 insertions, 37 deletions

diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c
index 124d5d690dde..08076182df7c 100644
--- a/drivers/net/tulip/de2104x.c
+++ b/drivers/net/tulip/de2104x.c
@@ -1932,7 +1932,6 @@ static int __devinit de_init_one (struct pci_dev *pdev,
         void __iomem *regs;
         unsigned long pciaddr;
         static int board_idx = -1;
-        DECLARE_MAC_BUF(mac);
 
         board_idx++;
 
@@ -2046,11 +2045,11 @@ static int __devinit de_init_one (struct pci_dev *pdev,
                 goto err_out_iomap;
 
         /* print info about board and interface just registered */
-        printk (KERN_INFO "%s: %s at 0x%lx, %s, IRQ %d\n",
+        printk (KERN_INFO "%s: %s at 0x%lx, %pM, IRQ %d\n",
                 dev->name,
                 de->de21040 ? "21040" : "21041",
                 dev->base_addr,
-                print_mac(mac, dev->dev_addr),
+                dev->dev_addr,
                 dev->irq);
 
         pci_set_drvdata(pdev, dev);
diff --git a/drivers/net/tulip/de4x5.c b/drivers/net/tulip/de4x5.c
index 6444cbec0bdc..1e7d5e29a5ae 100644
--- a/drivers/net/tulip/de4x5.c
+++ b/drivers/net/tulip/de4x5.c
@@ -1085,7 +1085,6 @@ de4x5_hw_init(struct net_device *dev, u_long iobase, struct device *gendev)
     struct de4x5_private *lp = netdev_priv(dev);
     struct pci_dev *pdev = NULL;
     int i, status=0;
-    DECLARE_MAC_BUF(mac);
 
     gendev->driver_data = dev;
 
@@ -1122,7 +1121,7 @@ de4x5_hw_init(struct net_device *dev, u_long iobase, struct device *gendev)
     printk ("%s: %s at 0x%04lx", gendev->bus_id, name, iobase);
 
     status = get_hw_addr(dev);
-    printk(", h/w address %s\n", print_mac(mac, dev->dev_addr));
+    printk(", h/w address %pM\n", dev->dev_addr);
 
     if (status != 0) {
         printk("      which has an Ethernet PROM CRC error.\n");
@@ -5401,7 +5400,6 @@ static void
 de4x5_dbg_srom(struct de4x5_srom *p)
 {
     int i;
-    DECLARE_MAC_BUF(mac);
 
     if (de4x5_debug & DEBUG_SROM) {
         printk("Sub-system Vendor ID: %04x\n", *((u_short *)p->sub_vendor_id));
@@ -5410,7 +5408,7 @@ de4x5_dbg_srom(struct de4x5_srom *p)
         printk("SROM version:         %02x\n", (u_char)(p->version));
         printk("# controllers:        %02x\n", (u_char)(p->num_controllers));
 
-        printk("Hardware Address:     %s\n", print_mac(mac, p->ieee_addr));
+        printk("Hardware Address:     %pM\n", p->ieee_addr);
         printk("CRC checksum:         %04x\n", (u_short)(p->chksum));
         for (i=0; i<64; i++) {
             printk("%3d %04x\n", i<<1, (u_short)*((u_short *)p+i));
@@ -5424,12 +5422,10 @@ static void
 de4x5_dbg_rx(struct sk_buff *skb, int len)
 {
     int i, j;
-    DECLARE_MAC_BUF(mac);
-    DECLARE_MAC_BUF(mac2);
 
     if (de4x5_debug & DEBUG_RX) {
-        printk("R: %s <- %s len/SAP:%02x%02x [%d]\n",
-               print_mac(mac, skb->data), print_mac(mac2, &skb->data[6]),
+        printk("R: %pM <- %pM len/SAP:%02x%02x [%d]\n",
+               skb->data, &skb->data[6],
                (u_char)skb->data[12],
                (u_char)skb->data[13],
                len);
diff --git a/drivers/net/tulip/dmfe.c b/drivers/net/tulip/dmfe.c
index 8e46a513a252..194f1825718a 100644
--- a/drivers/net/tulip/dmfe.c
+++ b/drivers/net/tulip/dmfe.c
@@ -362,7 +362,6 @@ static int __devinit dmfe_init_one (struct pci_dev *pdev,
         struct net_device *dev;
         u32 pci_pmr;
         int i, err;
-        DECLARE_MAC_BUF(mac);
 
         DMFE_DBUG(0, "dmfe_init_one()", 0);
 
@@ -471,12 +470,11 @@ static int __devinit dmfe_init_one (struct pci_dev *pdev,
         if (err)
                 goto err_out_res;
 
-        printk(KERN_INFO "%s: Davicom DM%04lx at pci%s, "
-               "%s, irq %d.\n",
+        printk(KERN_INFO "%s: Davicom DM%04lx at pci%s, %pM, irq %d.\n",
                dev->name,
                ent->driver_data >> 16,
                pci_name(pdev),
-               print_mac(mac, dev->dev_addr),
+               dev->dev_addr,
                dev->irq);
 
         pci_set_master(pdev);
diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c
index cafa89e60167..1c5ef230b770 100644
--- a/drivers/net/tulip/tulip_core.c
+++ b/drivers/net/tulip/tulip_core.c
@@ -1050,13 +1050,11 @@ static void set_rx_mode(struct net_device *dev)
                                         filterbit = ether_crc(ETH_ALEN, mclist->dmi_addr) >> 26;
                                 filterbit &= 0x3f;
                                 mc_filter[filterbit >> 5] |= 1 << (filterbit & 31);
-                                if (tulip_debug > 2) {
-                                        DECLARE_MAC_BUF(mac);
-                                        printk(KERN_INFO "%s: Added filter for %s"
+                                if (tulip_debug > 2)
+                                        printk(KERN_INFO "%s: Added filter for %pM"
                                                "  %8.8x bit %d.\n",
-                                               dev->name, print_mac(mac, mclist->dmi_addr),
+                                               dev->name, mclist->dmi_addr,
                                                ether_crc(ETH_ALEN, mclist->dmi_addr), filterbit);
-                                }
                         }
                         if (mc_filter[0] == tp->mc_filter[0]  &&
                                 mc_filter[1] == tp->mc_filter[1])
@@ -1250,7 +1248,6 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
         const char *chip_name = tulip_tbl[chip_idx].chip_name;
         unsigned int eeprom_missing = 0;
         unsigned int force_csr0 = 0;
-        DECLARE_MAC_BUF(mac);
 
 #ifndef MODULE
         static int did_version;         /* Already printed version info. */
@@ -1635,7 +1632,7 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
 
         if (eeprom_missing)
                 printk(" EEPROM not present,");
-        printk(" %s", print_mac(mac, dev->dev_addr));
+        printk(" %pM", dev->dev_addr);
         printk(", IRQ %d.\n", irq);
 
         if (tp->chip_id == PNIC2)
diff --git a/drivers/net/tulip/uli526x.c b/drivers/net/tulip/uli526x.c
index e9e628621639..298649a236cb 100644
--- a/drivers/net/tulip/uli526x.c
+++ b/drivers/net/tulip/uli526x.c
@@ -261,7 +261,6 @@ static int __devinit uli526x_init_one (struct pci_dev *pdev,
         struct uli526x_board_info *db;  /* board information structure */
         struct net_device *dev;
         int i, err;
-        DECLARE_MAC_BUF(mac);
 
         ULI526X_DBUG(0, "uli526x_init_one()", 0);
 
@@ -379,9 +378,9 @@ static int __devinit uli526x_init_one (struct pci_dev *pdev,
         if (err)
                 goto err_out_res;
 
-        printk(KERN_INFO "%s: ULi M%04lx at pci%s, %s, irq %d.\n",
+        printk(KERN_INFO "%s: ULi M%04lx at pci%s, %pM, irq %d.\n",
                dev->name,ent->driver_data >> 16,pci_name(pdev),
-               print_mac(mac, dev->dev_addr), dev->irq);
+               dev->dev_addr, dev->irq);
 
         pci_set_master(pdev);
 
diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c
index 50068194c163..e4cb408a70fe 100644
--- a/drivers/net/tulip/winbond-840.c
+++ b/drivers/net/tulip/winbond-840.c
@@ -355,7 +355,6 @@ static int __devinit w840_probe1 (struct pci_dev *pdev,
         int irq;
         int i, option = find_cnt < MAX_UNITS ? options[find_cnt] : 0;
         void __iomem *ioaddr;
-        DECLARE_MAC_BUF(mac);
 
         i = pci_enable_device(pdev);
         if (i) return i;
@@ -435,9 +434,9 @@ static int __devinit w840_probe1 (struct pci_dev *pdev,
         if (i)
                 goto err_out_cleardev;
 
-        printk(KERN_INFO "%s: %s at %p, %s, IRQ %d.\n",
+        printk(KERN_INFO "%s: %s at %p, %pM, IRQ %d.\n",
                dev->name, pci_id_tbl[chip_idx].name, ioaddr,
-               print_mac(mac, dev->dev_addr), irq);
+               dev->dev_addr, irq);
 
         if (np->drv_flags & CanHaveMII) {
                 int phy, phy_idx = 0;
@@ -1245,16 +1244,12 @@ static int netdev_rx(struct net_device *dev)
                         }
 #ifndef final_version                           /* Remove after testing. */
                         /* You will want this info for the initial debug. */
-                        if (debug > 5) {
-                                DECLARE_MAC_BUF(mac);
-                                DECLARE_MAC_BUF(mac2);
-
-                                printk(KERN_DEBUG "  Rx data %s %s"
+                        if (debug > 5)
+                                printk(KERN_DEBUG "  Rx data %pM %pM"
                                        " %2.2x%2.2x %d.%d.%d.%d.\n",
-                                       print_mac(mac, &skb->data[0]), print_mac(mac2, &skb->data[6]),
+                                       &skb->data[0], &skb->data[6],
                                        skb->data[12], skb->data[13],
                                        skb->data[14], skb->data[15], skb->data[16], skb->data[17]);
-                        }
 #endif
                         skb->protocol = eth_type_trans(skb, dev);
                         netif_rx(skb);
diff --git a/drivers/net/tulip/xircom_cb.c b/drivers/net/tulip/xircom_cb.c
index 6b93d0169116..3c0b96b0e925 100644
--- a/drivers/net/tulip/xircom_cb.c
+++ b/drivers/net/tulip/xircom_cb.c
@@ -1072,7 +1072,6 @@ static void read_mac_address(struct xircom_private *card)
         unsigned char j, tuple, link, data_id, data_count;
         unsigned long flags;
         int i;
-        DECLARE_MAC_BUF(mac);
 
         enter("read_mac_address");
 
@@ -1102,7 +1101,7 @@ static void read_mac_address(struct xircom_private *card)
                 }
         }
         spin_unlock_irqrestore(&card->lock, flags);
-        pr_debug(" %s\n", print_mac(mac, card->dev->dev_addr));
+        pr_debug(" %pM\n", card->dev->dev_addr);
         leave("read_mac_address");
 }