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

2 files changed, 9 insertions, 18 deletions

diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index 1b165a8c74f3..b9cde65e7f31 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -285,6 +285,7 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         int valid_mac = 0;
         u32 val;
         int pci_func_id = PCI_FUNC(pdev->devfn);
+        DECLARE_MAC_BUF(mac);
 
         printk(KERN_INFO "%s \n", netxen_nic_driver_string);
 
@@ -573,15 +574,9 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                 memcpy(netdev->perm_addr, netdev->dev_addr,
                         netdev->addr_len);
                 if (!is_valid_ether_addr(netdev->perm_addr)) {
-                        printk(KERN_ERR "%s: Bad MAC address "
-                                "%02x:%02x:%02x:%02x:%02x:%02x.\n",
-                                netxen_nic_driver_name,
-                                netdev->dev_addr[0],
-                                netdev->dev_addr[1],
-                                netdev->dev_addr[2],
-                                netdev->dev_addr[3],
-                                netdev->dev_addr[4],
-                                netdev->dev_addr[5]);
+                        printk(KERN_ERR "%s: Bad MAC address %s.\n",
+                               netxen_nic_driver_name,
+                               print_mac(mac, netdev->dev_addr));
                 } else {
                         if (adapter->macaddr_set)
                                 adapter->macaddr_set(adapter,
diff --git a/drivers/net/netxen/netxen_nic_niu.c b/drivers/net/netxen/netxen_nic_niu.c
index 05e0577a0e10..5b9e1b300fab 100644
--- a/drivers/net/netxen/netxen_nic_niu.c
+++ b/drivers/net/netxen/netxen_nic_niu.c
@@ -603,6 +603,7 @@ int netxen_niu_macaddr_set(struct netxen_adapter *adapter,
         int phy = physical_port[adapter->portnum];
         unsigned char mac_addr[6];
         int i;
+        DECLARE_MAC_BUF(mac);
 
         for (i = 0; i < 10; i++) {
                 temp[0] = temp[1] = 0;
@@ -627,15 +628,10 @@ int netxen_niu_macaddr_set(struct netxen_adapter *adapter,
         if (i == 10) {
                 printk(KERN_ERR "%s: cannot set Mac addr for %s\n",
                        netxen_nic_driver_name, adapter->netdev->name);
-                printk(KERN_ERR "MAC address set: "
-                       "%02x:%02x:%02x:%02x:%02x:%02x.\n",
-                       addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]);
-
-                printk(KERN_ERR "MAC address get: "
-                       "%02x:%02x:%02x:%02x:%02x:%02x.\n",
-                       mac_addr[0],
-                       mac_addr[1],
-                       mac_addr[2], mac_addr[3], mac_addr[4], mac_addr[5]);
+                printk(KERN_ERR "MAC address set: %s.\n",
+                       print_mac(mac, addr));
+                printk(KERN_ERR "MAC address get: %s.\n",
+                       print_mac(mac, mac_addr));
         }
         return 0;
 }