[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, 7 insertions, 4 deletions

diff --git a/drivers/net/wireless/zd1211rw/zd_chip.c b/drivers/net/wireless/zd1211rw/zd_chip.c
index 495904218b1b..750c0f99e86f 100644
--- a/drivers/net/wireless/zd1211rw/zd_chip.c
+++ b/drivers/net/wireless/zd1211rw/zd_chip.c
@@ -377,6 +377,7 @@ int zd_write_mac_addr(struct zd_chip *chip, const u8 *mac_addr)
                 [0] = { .addr = CR_MAC_ADDR_P1 },
                 [1] = { .addr = CR_MAC_ADDR_P2 },
         };
+        DECLARE_MAC_BUF(mac);
 
         reqs[0].value = (mac_addr[3] << 24)
                       | (mac_addr[2] << 16)
@@ -386,7 +387,7 @@ int zd_write_mac_addr(struct zd_chip *chip, const u8 *mac_addr)
                       |  mac_addr[4];
 
         dev_dbg_f(zd_chip_dev(chip),
-                "mac addr " MAC_FMT "\n", MAC_ARG(mac_addr));
+                "mac addr %s\n", print_mac(mac, mac_addr));
 
         mutex_lock(&chip->mutex);
         r = zd_iowrite32a_locked(chip, reqs, ARRAY_SIZE(reqs));
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c
index 451308d7095d..06b342b39792 100644
--- a/drivers/net/wireless/zd1211rw/zd_mac.c
+++ b/drivers/net/wireless/zd1211rw/zd_mac.c
@@ -289,12 +289,13 @@ int zd_mac_set_mac_address(struct net_device *netdev, void *p)
         struct sockaddr *addr = p;
         struct zd_mac *mac = zd_netdev_mac(netdev);
         struct zd_chip *chip = &mac->chip;
+        DECLARE_MAC_BUF(mac2);
 
         if (!is_valid_ether_addr(addr->sa_data))
                 return -EADDRNOTAVAIL;
 
         dev_dbg_f(zd_mac_dev(mac),
-                  "Setting MAC to " MAC_FMT "\n", MAC_ARG(addr->sa_data));
+                  "Setting MAC to %s\n", print_mac(mac2, addr->sa_data));
 
         if (netdev->flags & IFF_UP) {
                 r = zd_write_mac_addr(chip, addr->sa_data);
@@ -329,6 +330,7 @@ void zd_mac_set_multicast_list(struct net_device *dev)
         struct zd_mc_hash hash;
         struct dev_mc_list *mc;
         unsigned long flags;
+        DECLARE_MAC_BUF(mac2);
 
         if (dev->flags & (IFF_PROMISC|IFF_ALLMULTI) ||
                         ieee->iw_mode == IW_MODE_MONITOR) {
@@ -336,8 +338,8 @@ void zd_mac_set_multicast_list(struct net_device *dev)
         } else {
                 zd_mc_clear(&hash);
                 for (mc = dev->mc_list; mc; mc = mc->next) {
-                        dev_dbg_f(zd_mac_dev(mac), "mc addr " MAC_FMT "\n",
-                                  MAC_ARG(mc->dmi_addr));
+                        dev_dbg_f(zd_mac_dev(mac), "mc addr %s\n",
+                                  print_mac(mac2, mc->dmi_addr));
                         zd_mc_add_addr(&hash, mc->dmi_addr);
                 }
         }