1 files changed, 10 insertions, 23 deletions

diff --git a/drivers/net/wireless/wavelan.c b/drivers/net/wireless/wavelan.c
index e939a73ff794..6fa3d792ae27 100644
--- a/drivers/net/wireless/wavelan.c
+++ b/drivers/net/wireless/wavelan.c
@@ -859,8 +859,6 @@ static void wv_82586_reconfig(struct net_device * dev)
  */
 static void wv_psa_show(psa_t * p)
 {
-        DECLARE_MAC_BUF(mac);
-
         printk(KERN_DEBUG "##### WaveLAN PSA contents: #####\n");
         printk(KERN_DEBUG "psa_io_base_addr_1: 0x%02X %02X %02X %02X\n",
                p->psa_io_base_addr_1,
@@ -872,13 +870,10 @@ static void wv_psa_show(psa_t * p)
         printk(KERN_DEBUG "psa_holi_params: 0x%02x, ", p->psa_holi_params);
         printk("psa_int_req_no: %d\n", p->psa_int_req_no);
 #ifdef DEBUG_SHOW_UNUSED
-        printk(KERN_DEBUG "psa_unused0[]: %s\n",
-               print_mac(mac, p->psa_unused0));
+        printk(KERN_DEBUG "psa_unused0[]: %pM\n", p->psa_unused0);
 #endif                          /* DEBUG_SHOW_UNUSED */
-        printk(KERN_DEBUG "psa_univ_mac_addr[]: %s\n",
-               print_mac(mac, p->psa_univ_mac_addr));
-        printk(KERN_DEBUG "psa_local_mac_addr[]: %s\n",
-               print_mac(mac, p->psa_local_mac_addr));
+        printk(KERN_DEBUG "psa_univ_mac_addr[]: %pM\n", p->psa_univ_mac_addr);
+        printk(KERN_DEBUG "psa_local_mac_addr[]: %pM\n", p->psa_local_mac_addr);
         printk(KERN_DEBUG "psa_univ_local_sel: %d, ",
                p->psa_univ_local_sel);
         printk("psa_comp_number: %d, ", p->psa_comp_number);
@@ -1220,14 +1215,13 @@ static inline void wv_packet_info(u8 * p,	/* Packet to dump */
 {                               /* Name of the function */
         int i;
         int maxi;
-        DECLARE_MAC_BUF(mac);
 
         printk(KERN_DEBUG
-               "%s: %s(): dest %s, length %d\n",
-               msg1, msg2, print_mac(mac, p), length);
+               "%s: %s(): dest %pM, length %d\n",
+               msg1, msg2, p, length);
         printk(KERN_DEBUG
-               "%s: %s(): src %s, type 0x%02X%02X\n",
-               msg1, msg2, print_mac(mac, &p[6]), p[12], p[13]);
+               "%s: %s(): src %pM, type 0x%02X%02X\n",
+               msg1, msg2, &p[6], p[12], p[13]);
 
 #ifdef DEBUG_PACKET_DUMP
 
@@ -1258,9 +1252,6 @@ static void wv_init_info(struct net_device * dev)
         short ioaddr = dev->base_addr;
         net_local *lp = (net_local *) dev->priv;
         psa_t psa;
-#ifdef DEBUG_BASIC_SHOW
-        DECLARE_MAC_BUF(mac);
-#endif
 
         /* Read the parameter storage area */
         psa_read(ioaddr, lp->hacr, 0, (unsigned char *) &psa, sizeof(psa));
@@ -1277,8 +1268,8 @@ static void wv_init_info(struct net_device * dev)
 
 #ifdef DEBUG_BASIC_SHOW
         /* Now, let's go for the basic stuff. */
-        printk(KERN_NOTICE "%s: WaveLAN at %#x, %s, IRQ %d",
-               dev->name, ioaddr, print_mac(mac, dev->dev_addr), dev->irq);
+        printk(KERN_NOTICE "%s: WaveLAN at %#x, %pM, IRQ %d",
+               dev->name, ioaddr, dev->dev_addr, dev->irq);
 
         /* Print current network ID. */
         if (psa.psa_nwid_select)
@@ -3565,15 +3556,11 @@ static void wv_82586_config(struct net_device * dev)
                               WAVELAN_ADDR_SIZE >> 1);
 
 #ifdef DEBUG_CONFIG_INFO
- {
-                DECLARE_MAC_BUF(mac);
                 printk(KERN_DEBUG
                        "%s: wv_82586_config(): set %d multicast addresses:\n",
                        dev->name, lp->mc_count);
                 for (dmi = dev->mc_list; dmi; dmi = dmi->next)
-                        printk(KERN_DEBUG " %s\n",
-                               print_mac(mac, dmi->dmi_addr));
- }
+                        printk(KERN_DEBUG " %pM\n", dmi->dmi_addr);
 #endif
         }