[NET]: Introduce and use print_mac() and DECLARE_MAC_BUF()

This is nicer than the MAC_FMT stuff.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

7 files changed, 47 insertions, 70 deletions

diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c
index ba3d0e5574a4..f12e33a17363 100644
--- a/drivers/net/tulip/de2104x.c
+++ b/drivers/net/tulip/de2104x.c
@@ -1929,6 +1929,7 @@ 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++;
 
@@ -2042,15 +2043,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, "
-                "%02x:%02x:%02x:%02x:%02x:%02x, "
-                "IRQ %d\n",
+        printk (KERN_INFO "%s: %s at 0x%lx, %s, IRQ %d\n",
                 dev->name,
                 de->de21040 ? "21040" : "21041",
                 dev->base_addr,
-                dev->dev_addr[0], dev->dev_addr[1],
-                dev->dev_addr[2], dev->dev_addr[3],
-                dev->dev_addr[4], dev->dev_addr[5],
+                print_mac(mac, 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 ee4215ca63f0..4633cc6dd412 100644
--- a/drivers/net/tulip/de4x5.c
+++ b/drivers/net/tulip/de4x5.c
@@ -1088,6 +1088,7 @@ 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;
 
@@ -1123,12 +1124,8 @@ de4x5_hw_init(struct net_device *dev, u_long iobase, struct device *gendev)
     dev->base_addr = iobase;
     printk ("%s: %s at 0x%04lx", gendev->bus_id, name, iobase);
 
-    printk(", h/w address ");
     status = get_hw_addr(dev);
-    for (i = 0; i < ETH_ALEN - 1; i++) {     /* get the ethernet addr. */
-        printk("%2.2x:", dev->dev_addr[i]);
-    }
-    printk("%2.2x,\n", dev->dev_addr[i]);
+    printk(", h/w address %s\n", print_mac(mac, dev->dev_addr));
 
     if (status != 0) {
         printk("      which has an Ethernet PROM CRC error.\n");
@@ -5468,19 +5465,16 @@ 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));
         printk("Sub-system ID:        %04x\n", *((u_short *)p->sub_system_id));
         printk("ID Block CRC:         %02x\n", (u_char)(p->id_block_crc));
         printk("SROM version:         %02x\n", (u_char)(p->version));
-        printk("# controllers:         %02x\n", (u_char)(p->num_controllers));
+        printk("# controllers:        %02x\n", (u_char)(p->num_controllers));
 
-        printk("Hardware Address:     ");
-        for (i=0;i<ETH_ALEN-1;i++) {
-            printk("%02x:", (u_char)*(p->ieee_addr+i));
-        }
-        printk("%02x\n", (u_char)*(p->ieee_addr+i));
+        printk("Hardware Address:     %s\n", print_mac(mac, 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));
@@ -5494,21 +5488,12 @@ 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: %02x:%02x:%02x:%02x:%02x:%02x <- %02x:%02x:%02x:%02x:%02x:%02x len/SAP:%02x%02x [%d]\n",
-               (u_char)skb->data[0],
-               (u_char)skb->data[1],
-               (u_char)skb->data[2],
-               (u_char)skb->data[3],
-               (u_char)skb->data[4],
-               (u_char)skb->data[5],
-               (u_char)skb->data[6],
-               (u_char)skb->data[7],
-               (u_char)skb->data[8],
-               (u_char)skb->data[9],
-               (u_char)skb->data[10],
-               (u_char)skb->data[11],
+        printk("R: %s <- %s len/SAP:%02x%02x [%d]\n",
+               print_mac(mac, skb->data), print_mac(mac2, &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 e2596e9ab1d7..ca90566d5bcd 100644
--- a/drivers/net/tulip/dmfe.c
+++ b/drivers/net/tulip/dmfe.c
@@ -362,6 +362,7 @@ 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);
 
@@ -470,13 +471,13 @@ 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,",
-                dev->name,
-                ent->driver_data >> 16,
-                pci_name(pdev));
-        for (i = 0; i < 6; i++)
-                printk("%c%02x", i ? ':' : ' ', dev->dev_addr[i]);
-        printk(", irq %d.\n", dev->irq);
+        printk(KERN_INFO "%s: Davicom DM%04lx at pci%s, "
+               "%s, irq %d.\n",
+               dev->name,
+               ent->driver_data >> 16,
+               pci_name(pdev),
+               print_mac(mac, 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 66977aaa7176..80fee2292531 100644
--- a/drivers/net/tulip/tulip_core.c
+++ b/drivers/net/tulip/tulip_core.c
@@ -1051,12 +1051,11 @@ static void set_rx_mode(struct net_device *dev)
                                 filterbit &= 0x3f;
                                 mc_filter[filterbit >> 5] |= 1 << (filterbit & 31);
                                 if (tulip_debug > 2) {
-                                        printk(KERN_INFO "%s: Added filter for %2.2x:%2.2x:%2.2x:"
-                                                   "%2.2x:%2.2x:%2.2x  %8.8x bit %d.\n", dev->name,
-                                                   mclist->dmi_addr[0], mclist->dmi_addr[1],
-                                                   mclist->dmi_addr[2], mclist->dmi_addr[3],
-                                                   mclist->dmi_addr[4], mclist->dmi_addr[5],
-                                                   ether_crc(ETH_ALEN, mclist->dmi_addr), filterbit);
+                                        DECLARE_MAC_BUF(mac);
+                                        printk(KERN_INFO "%s: Added filter for %s"
+                                               "  %8.8x bit %d.\n",
+                                               dev->name, print_mac(mac, mclist->dmi_addr),
+                                               ether_crc(ETH_ALEN, mclist->dmi_addr), filterbit);
                                 }
                         }
                         if (mc_filter[0] == tp->mc_filter[0]  &&
@@ -1256,6 +1255,7 @@ 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. */
@@ -1639,8 +1639,7 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
 
         if (eeprom_missing)
                 printk(" EEPROM not present,");
-        for (i = 0; i < 6; i++)
-                printk("%c%2.2X", i ? ':' : ' ', dev->dev_addr[i]);
+        printk(" %s", print_mac(mac, 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 2b7257d97c32..a4fd782bcd27 100644
--- a/drivers/net/tulip/uli526x.c
+++ b/drivers/net/tulip/uli526x.c
@@ -258,6 +258,7 @@ 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);
 
@@ -372,11 +373,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,",dev->name,ent->driver_data >> 16,pci_name(pdev));
-
-        for (i = 0; i < 6; i++)
-                printk("%c%02x", i ? ':' : ' ', dev->dev_addr[i]);
-        printk(", irq %d.\n", dev->irq);
+        printk(KERN_INFO "%s: ULi M%04lx at pci%s, %s, irq %d.\n",
+               dev->name,ent->driver_data >> 16,pci_name(pdev),
+               print_mac(mac, 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 e00833fadc0b..3c40dd6e1a2f 100644
--- a/drivers/net/tulip/winbond-840.c
+++ b/drivers/net/tulip/winbond-840.c
@@ -354,6 +354,7 @@ 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;
@@ -433,11 +434,9 @@ static int __devinit w840_probe1 (struct pci_dev *pdev,
         if (i)
                 goto err_out_cleardev;
 
-        printk(KERN_INFO "%s: %s at %p, ",
-                   dev->name, pci_id_tbl[chip_idx].name, ioaddr);
-        for (i = 0; i < 5; i++)
-                        printk("%2.2x:", dev->dev_addr[i]);
-        printk("%2.2x, IRQ %d.\n", dev->dev_addr[i], irq);
+        printk(KERN_INFO "%s: %s at %p, %s, IRQ %d.\n",
+               dev->name, pci_id_tbl[chip_idx].name, ioaddr,
+               print_mac(mac, dev->dev_addr), irq);
 
         if (np->drv_flags & CanHaveMII) {
                 int phy, phy_idx = 0;
@@ -1245,16 +1244,16 @@ 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)
-                                printk(KERN_DEBUG "  Rx data %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:"
-                                           "%2.2x %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x %2.2x%2.2x "
-                                           "%d.%d.%d.%d.\n",
-                                           skb->data[0], skb->data[1], skb->data[2], skb->data[3],
-                                           skb->data[4], skb->data[5], skb->data[6], skb->data[7],
-                                           skb->data[8], skb->data[9], skb->data[10],
-                                           skb->data[11], skb->data[12], skb->data[13],
-                                           skb->data[14], skb->data[15], skb->data[16],
-                                           skb->data[17]);
+                        if (debug > 5) {
+                                DECLARE_MAC_BUF(mac);
+                                DECLARE_MAC_BUF(mac2);
+
+                                printk(KERN_DEBUG "  Rx data %s %s"
+                                       " %2.2x%2.2x %d.%d.%d.%d.\n",
+                                       print_mac(mac, &skb->data[0]), print_mac(mac2, &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 de8c92083e92..70befe33e454 100644
--- a/drivers/net/tulip/xircom_cb.c
+++ b/drivers/net/tulip/xircom_cb.c
@@ -1074,6 +1074,7 @@ 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");
 
@@ -1103,11 +1104,7 @@ static void read_mac_address(struct xircom_private *card)
                 }
         }
         spin_unlock_irqrestore(&card->lock, flags);
-#ifdef DEBUG
-        for (i = 0; i < 6; i++)
-                printk("%c%2.2X", i ? ':' : ' ', card->dev->dev_addr[i]);
-        printk("\n");
-#endif
+        pr_debug(" %s\n", print_mac(mac, card->dev->dev_addr));
         leave("read_mac_address");
 }