[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>

5 files changed, 22 insertions, 28 deletions

diff --git a/drivers/net/arm/am79c961a.c b/drivers/net/arm/am79c961a.c
index 77964556776e..ba6bd03a015f 100644
--- a/drivers/net/arm/am79c961a.c
+++ b/drivers/net/arm/am79c961a.c
@@ -741,12 +741,10 @@ static int __init am79c961_probe(struct platform_device *pdev)
 
         ret = register_netdev(dev);
         if (ret == 0) {
-                printk(KERN_INFO "%s: ether address ", dev->name);
-
-                /* Retrive and print the ethernet address. */
-                for (i = 0; i < 6; i++)
-                        printk (i == 5 ? "%02x\n" : "%02x:", dev->dev_addr[i]);
+                DECLARE_MAC_BUF(mac);
 
+                printk(KERN_INFO "%s: ether address %s\n",
+                       dev->name, print_mac(mac, dev->dev_addr));
                 return 0;
         }
 
diff --git a/drivers/net/arm/at91_ether.c b/drivers/net/arm/at91_ether.c
index 619810a01e5b..25b114a4e2b1 100644
--- a/drivers/net/arm/at91_ether.c
+++ b/drivers/net/arm/at91_ether.c
@@ -485,6 +485,7 @@ static void update_mac_address(struct net_device *dev)
 static int set_mac_address(struct net_device *dev, void* addr)
 {
         struct sockaddr *address = addr;
+        DECLARE_MAC_BUF(mac);
 
         if (!is_valid_ether_addr(address->sa_data))
                 return -EADDRNOTAVAIL;
@@ -492,9 +493,8 @@ static int set_mac_address(struct net_device *dev, void* addr)
         memcpy(dev->dev_addr, address->sa_data, dev->addr_len);
         update_mac_address(dev);
 
-        printk("%s: Setting MAC address to %02x:%02x:%02x:%02x:%02x:%02x\n", dev->name,
-                dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2],
-                dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]);
+        printk("%s: Setting MAC address to %s\n", dev->name,
+               print_mac(mac, dev->dev_addr));
 
         return 0;
 }
@@ -979,6 +979,7 @@ static int __init at91ether_setup(unsigned long phy_type, unsigned short phy_add
         struct at91_private *lp;
         unsigned int val;
         int res;
+        DECLARE_MAC_BUF(mac);
 
         dev = alloc_etherdev(sizeof(struct at91_private));
         if (!dev)
@@ -1081,12 +1082,11 @@ static int __init at91ether_setup(unsigned long phy_type, unsigned short phy_add
         }
 
         /* Display ethernet banner */
-        printk(KERN_INFO "%s: AT91 ethernet at 0x%08x int=%d %s%s (%02x:%02x:%02x:%02x:%02x:%02x)\n",
-                dev->name, (uint) dev->base_addr, dev->irq,
-                at91_emac_read(AT91_EMAC_CFG) & AT91_EMAC_SPD ? "100-" : "10-",
-                at91_emac_read(AT91_EMAC_CFG) & AT91_EMAC_FD ? "FullDuplex" : "HalfDuplex",
-                dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2],
-                dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]);
+        printk(KERN_INFO "%s: AT91 ethernet at 0x%08x int=%d %s%s (%s)\n",
+               dev->name, (uint) dev->base_addr, dev->irq,
+               at91_emac_read(AT91_EMAC_CFG) & AT91_EMAC_SPD ? "100-" : "10-",
+               at91_emac_read(AT91_EMAC_CFG) & AT91_EMAC_FD ? "FullDuplex" : "HalfDuplex",
+               print_mac(mac, dev->dev_addr));
         if ((phy_type == MII_DM9161_ID) || (lp->phy_type == MII_DM9161A_ID))
                 printk(KERN_INFO "%s: Davicom 9161 PHY %s\n", dev->name, (lp->phy_media == PORT_FIBRE) ? "(Fiber)" : "(Copper)");
         else if (phy_type == MII_LXT971A_ID)
diff --git a/drivers/net/arm/ether1.c b/drivers/net/arm/ether1.c
index 6ec8a587c1d2..3bb9e293e2ef 100644
--- a/drivers/net/arm/ether1.c
+++ b/drivers/net/arm/ether1.c
@@ -996,6 +996,7 @@ ether1_probe(struct expansion_card *ec, const struct ecard_id *id)
 {
         struct net_device *dev;
         int i, ret = 0;
+        DECLARE_MAC_BUF(mac);
 
         ether1_banner();
 
@@ -1043,12 +1044,9 @@ ether1_probe(struct expansion_card *ec, const struct ecard_id *id)
         if (ret)
                 goto free;
 
-        printk(KERN_INFO "%s: ether1 in slot %d, ",
-                dev->name, ec->slot_no);
+        printk(KERN_INFO "%s: ether1 in slot %d, %s\n",
+                dev->name, ec->slot_no, print_mac(mac, dev->dev_addr));
     
-        for (i = 0; i < 6; i++)
-                printk ("%2.2x%c", dev->dev_addr[i], i == 5 ? '\n' : ':');
-
         ecard_set_drvdata(ec, dev);
         return 0;
 
diff --git a/drivers/net/arm/ether3.c b/drivers/net/arm/ether3.c
index 4a914748c0e4..67e96ae85035 100644
--- a/drivers/net/arm/ether3.c
+++ b/drivers/net/arm/ether3.c
@@ -775,7 +775,8 @@ ether3_probe(struct expansion_card *ec, const struct ecard_id *id)
 {
         const struct ether3_data *data = id->data;
         struct net_device *dev;
-        int i, bus_type, ret;
+        int bus_type, ret;
+        DECLARE_MAC_BUF(mac);
 
         ether3_banner();
 
@@ -858,9 +859,8 @@ ether3_probe(struct expansion_card *ec, const struct ecard_id *id)
         if (ret)
                 goto free;
 
-        printk("%s: %s in slot %d, ", dev->name, data->name, ec->slot_no);
-        for (i = 0; i < 6; i++)
-                printk("%2.2x%c", dev->dev_addr[i], i == 5 ? '\n' : ':');
+        printk("%s: %s in slot %d, %s\n",
+               dev->name, data->name, ec->slot_no, print_mac(mac, dev->dev_addr));
 
         ecard_set_drvdata(ec, dev);
         return 0;
diff --git a/drivers/net/arm/etherh.c b/drivers/net/arm/etherh.c
index 5d093b3ddcd4..00081d2b9cd5 100644
--- a/drivers/net/arm/etherh.c
+++ b/drivers/net/arm/etherh.c
@@ -648,6 +648,7 @@ etherh_probe(struct expansion_card *ec, const struct ecard_id *id)
         struct net_device *dev;
         struct etherh_priv *eh;
         int i, ret;
+        DECLARE_MAC_BUF(mac);
 
         etherh_banner();
 
@@ -745,11 +746,8 @@ etherh_probe(struct expansion_card *ec, const struct ecard_id *id)
         if (ret)
                 goto free;
 
-        printk(KERN_INFO "%s: %s in slot %d, ",
-                dev->name, data->name, ec->slot_no);
-
-        for (i = 0; i < 6; i++)
-                printk("%2.2x%c", dev->dev_addr[i], i == 5 ? '\n' : ':');
+        printk(KERN_INFO "%s: %s in slot %d, %s\n",
+                dev->name, data->name, ec->slot_no, print_mac(mac, dev->dev_addr));
 
         ecard_set_drvdata(ec, dev);