14 files changed, 27 insertions, 85 deletions

diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c
index b55257f31c71..9cfc941aab0a 100644
--- a/drivers/net/bnx2x_main.c
+++ b/drivers/net/bnx2x_main.c
@@ -9851,11 +9851,8 @@ static void bnx2x_set_rx_mode(struct net_device *dev)
                              mclist && (i < dev->mc_count);
                              i++, mclist = mclist->next) {
 
-                                DP(NETIF_MSG_IFUP, "Adding mcast MAC: "
-                                   "%02x:%02x:%02x:%02x:%02x:%02x\n",
-                                   mclist->dmi_addr[0], mclist->dmi_addr[1],
-                                   mclist->dmi_addr[2], mclist->dmi_addr[3],
-                                   mclist->dmi_addr[4], mclist->dmi_addr[5]);
+                                DP(NETIF_MSG_IFUP, "Adding mcast MAC: %pM\n",
+                                   mclist->dmi_addr);
 
                                 crc = crc32c_le(0, mclist->dmi_addr, ETH_ALEN);
                                 bit = (crc >> 24) & 0xff;
diff --git a/drivers/net/de620.c b/drivers/net/de620.c
index 254bb4adb6b7..643b1ea08414 100644
--- a/drivers/net/de620.c
+++ b/drivers/net/de620.c
@@ -875,10 +875,7 @@ struct net_device * __init de620_probe(int unit)
         if (de620_debug) {
                 printk("\nEEPROM contents:\n");
                 printk("RAM_Size = 0x%02X\n", nic_data.RAM_Size);
-                printk("NodeID = %02X:%02X:%02X:%02X:%02X:%02X\n",
-                        nic_data.NodeID[0], nic_data.NodeID[1],
-                        nic_data.NodeID[2], nic_data.NodeID[3],
-                        nic_data.NodeID[4], nic_data.NodeID[5]);
+                printk("NodeID = %pM\n", nic_data.NodeID);
                 printk("Model = %d\n", nic_data.Model);
                 printk("Media = %d\n", nic_data.Media);
                 printk("SCR = 0x%02x\n", nic_data.SCR);
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index abd492b7336d..a5c9266cd7ce 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -4652,14 +4652,12 @@ static void e1000_print_device_info(struct e1000_adapter *adapter)
         u32 pba_num;
 
         /* print bus type/speed/width info */
-        e_info("(PCI Express:2.5GB/s:%s) %02x:%02x:%02x:%02x:%02x:%02x\n",
+        e_info("(PCI Express:2.5GB/s:%s) %pM\n",
                /* bus width */
                ((hw->bus.width == e1000_bus_width_pcie_x4) ? "Width x4" :
                 "Width x1"),
                /* MAC address */
-               netdev->dev_addr[0], netdev->dev_addr[1],
-               netdev->dev_addr[2], netdev->dev_addr[3],
-               netdev->dev_addr[4], netdev->dev_addr[5]);
+               netdev->dev_addr);
         e_info("Intel(R) PRO/%s Network Connection\n",
                (hw->phy.type == e1000_phy_ife) ? "10/100" : "1000");
         e1000e_read_pba_num(hw, &pba_num);
@@ -4906,10 +4904,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
         memcpy(netdev->perm_addr, adapter->hw.mac.addr, netdev->addr_len);
 
         if (!is_valid_ether_addr(netdev->perm_addr)) {
-                e_err("Invalid MAC Address: %02x:%02x:%02x:%02x:%02x:%02x\n",
-                      netdev->perm_addr[0], netdev->perm_addr[1],
-                      netdev->perm_addr[2], netdev->perm_addr[3],
-                      netdev->perm_addr[4], netdev->perm_addr[5]);
+                e_err("Invalid MAC Address: %pM\n", netdev->perm_addr);
                 err = -EIO;
                 goto err_eeprom;
         }
diff --git a/drivers/net/enic/enic_res.c b/drivers/net/enic/enic_res.c
index 95184b9108ef..e5fc9384f8f5 100644
--- a/drivers/net/enic/enic_res.c
+++ b/drivers/net/enic/enic_res.c
@@ -90,11 +90,8 @@ int enic_get_vnic_config(struct enic *enic)
 
         c->intr_timer = min_t(u16, VNIC_INTR_TIMER_MAX, c->intr_timer);
 
-        printk(KERN_INFO PFX "vNIC MAC addr %02x:%02x:%02x:%02x:%02x:%02x "
-                "wq/rq %d/%d\n",
-                enic->mac_addr[0], enic->mac_addr[1], enic->mac_addr[2],
-                enic->mac_addr[3], enic->mac_addr[4], enic->mac_addr[5],
-                c->wq_desc_count, c->rq_desc_count);
+        printk(KERN_INFO PFX "vNIC MAC addr %pM wq/rq %d/%d\n",
+                enic->mac_addr, c->wq_desc_count, c->rq_desc_count);
         printk(KERN_INFO PFX "vNIC mtu %d csum tx/rx %d/%d tso/lro %d/%d "
                 "intr timer %d\n",
                 c->mtu, ENIC_SETTING(enic, TXCSUM),
diff --git a/drivers/net/enic/vnic_dev.c b/drivers/net/enic/vnic_dev.c
index 4d104f5c30f9..9afd33c7188d 100644
--- a/drivers/net/enic/vnic_dev.c
+++ b/drivers/net/enic/vnic_dev.c
@@ -489,10 +489,7 @@ void vnic_dev_add_addr(struct vnic_dev *vdev, u8 *addr)
 
         err = vnic_dev_cmd(vdev, CMD_ADDR_ADD, &a0, &a1, wait);
         if (err)
-                printk(KERN_ERR
-                        "Can't add addr [%02x:%02x:%02x:%02x:%02x:%02x], %d\n",
-                        addr[0], addr[1], addr[2], addr[3], addr[4], addr[5],
-                        err);
+                printk(KERN_ERR "Can't add addr [%pM], %d\n", addr, err);
 }
 
 void vnic_dev_del_addr(struct vnic_dev *vdev, u8 *addr)
@@ -507,10 +504,7 @@ void vnic_dev_del_addr(struct vnic_dev *vdev, u8 *addr)
 
         err = vnic_dev_cmd(vdev, CMD_ADDR_DEL, &a0, &a1, wait);
         if (err)
-                printk(KERN_ERR
-                        "Can't del addr [%02x:%02x:%02x:%02x:%02x:%02x], %d\n",
-                        addr[0], addr[1], addr[2], addr[3], addr[4], addr[5],
-                        err);
+                printk(KERN_ERR "Can't del addr [%pM], %d\n", addr, err);
 }
 
 int vnic_dev_notify_set(struct vnic_dev *vdev, u16 intr)
diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c
index cb51c1fb0338..e32f08d18c65 100644
--- a/drivers/net/fs_enet/fs_enet-main.c
+++ b/drivers/net/fs_enet/fs_enet-main.c
@@ -1115,10 +1115,7 @@ static int __devinit fs_enet_probe(struct of_device *ofdev,
         if (ret)
                 goto out_free_bd;
 
-        printk(KERN_INFO "%s: fs_enet: %02x:%02x:%02x:%02x:%02x:%02x\n",
-               ndev->name,
-               ndev->dev_addr[0], ndev->dev_addr[1], ndev->dev_addr[2],
-               ndev->dev_addr[3], ndev->dev_addr[4], ndev->dev_addr[5]);
+        printk(KERN_INFO "%s: fs_enet: %pM\n", ndev->name, ndev->dev_addr);
 
         return 0;
 
diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c
index 2ee2622258f5..1232ef9fb9ef 100644
--- a/drivers/net/ibm_newemac/core.c
+++ b/drivers/net/ibm_newemac/core.c
@@ -396,9 +396,7 @@ static void emac_hash_mc(struct emac_instance *dev)
 
         for (dmi = dev->ndev->mc_list; dmi; dmi = dmi->next) {
                 int slot, reg, mask;
-                DBG2(dev, "mc %02x:%02x:%02x:%02x:%02x:%02x" NL,
-                     dmi->dmi_addr[0], dmi->dmi_addr[1], dmi->dmi_addr[2],
-                     dmi->dmi_addr[3], dmi->dmi_addr[4], dmi->dmi_addr[5]);
+                DBG2(dev, "mc %pM" NL, dmi->dmi_addr);
 
                 slot = EMAC_XAHT_CRC_TO_SLOT(dev, ether_crc(ETH_ALEN, dmi->dmi_addr));
                 reg = EMAC_XAHT_SLOT_TO_REG(dev, slot);
@@ -2865,11 +2863,8 @@ static int __devinit emac_probe(struct of_device *ofdev,
         wake_up_all(&emac_probe_wait);
 
 
-        printk(KERN_INFO
-               "%s: EMAC-%d %s, MAC %02x:%02x:%02x:%02x:%02x:%02x\n",
-               ndev->name, dev->cell_index, np->full_name,
-               ndev->dev_addr[0], ndev->dev_addr[1], ndev->dev_addr[2],
-               ndev->dev_addr[3], ndev->dev_addr[4], ndev->dev_addr[5]);
+        printk(KERN_INFO "%s: EMAC-%d %s, MAC %pM\n",
+               ndev->name, dev->cell_index, np->full_name, ndev->dev_addr);
 
         if (dev->phy_mode == PHY_MODE_SGMII)
                 printk(KERN_NOTICE "%s: in SGMII mode\n", ndev->name);
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index 1f397cd99414..3b42665ef1d4 100644
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
@@ -1275,16 +1275,14 @@ static int __devinit igb_probe(struct pci_dev *pdev,
 
         dev_info(&pdev->dev, "Intel(R) Gigabit Ethernet Network Connection\n");
         /* print bus type/speed/width info */
-        dev_info(&pdev->dev,
-                 "%s: (PCIe:%s:%s) %02x:%02x:%02x:%02x:%02x:%02x\n",
+        dev_info(&pdev->dev, "%s: (PCIe:%s:%s) %pM\n",
                  netdev->name,
                  ((hw->bus.speed == e1000_bus_speed_2500)
                   ? "2.5Gb/s" : "unknown"),
                  ((hw->bus.width == e1000_bus_width_pcie_x4)
                   ? "Width x4" : (hw->bus.width == e1000_bus_width_pcie_x1)
                   ? "Width x1" : "unknown"),
-                 netdev->dev_addr[0], netdev->dev_addr[1], netdev->dev_addr[2],
-                 netdev->dev_addr[3], netdev->dev_addr[4], netdev->dev_addr[5]);
+                 netdev->dev_addr);
 
         igb_read_part_num(hw, &part_num);
         dev_info(&pdev->dev, "%s: PBA No: %06x-%03x\n", netdev->name,
diff --git a/drivers/net/ioc3-eth.c b/drivers/net/ioc3-eth.c
index 9803af1f0f58..afac65e46773 100644
--- a/drivers/net/ioc3-eth.c
+++ b/drivers/net/ioc3-eth.c
@@ -390,11 +390,8 @@ static int nic_init(struct ioc3 *ioc3)
         }
 
         printk("Found %s NIC", type);
-        if (type != unknown) {
-                printk (" registration number %02x:%02x:%02x:%02x:%02x:%02x,"
-                        " CRC %02x", serial[0], serial[1], serial[2],
-                        serial[3], serial[4], serial[5], crc);
-        }
+        if (type != unknown)
+                printk (" registration number %pM, CRC %02x", serial, crc);
         printk(".\n");
 
         return 0;
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 7548fb7360d9..028bfb20412c 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -3877,8 +3877,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
         pci_read_config_word(pdev, IXGBE_PCI_LINK_STATUS, &link_status);
         link_speed = link_status & IXGBE_PCI_LINK_SPEED;
         link_width = link_status & IXGBE_PCI_LINK_WIDTH;
-        dev_info(&pdev->dev, "(PCI Express:%s:%s) "
-                 "%02x:%02x:%02x:%02x:%02x:%02x\n",
+        dev_info(&pdev->dev, "(PCI Express:%s:%s) %pM\n",
                 ((link_speed == IXGBE_PCI_LINK_SPEED_5000) ? "5.0Gb/s" :
                  (link_speed == IXGBE_PCI_LINK_SPEED_2500) ? "2.5Gb/s" :
                  "Unknown"),
@@ -3887,8 +3886,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
                  (link_width == IXGBE_PCI_LINK_WIDTH_2) ? "Width x2" :
                  (link_width == IXGBE_PCI_LINK_WIDTH_1) ? "Width x1" :
                  "Unknown"),
-                netdev->dev_addr[0], netdev->dev_addr[1], netdev->dev_addr[2],
-                netdev->dev_addr[3], netdev->dev_addr[4], netdev->dev_addr[5]);
+                netdev->dev_addr);
         ixgbe_read_pba_num_generic(hw, &part_num);
         dev_info(&pdev->dev, "MAC: %d, PHY: %d, PBA No: %06x-%03x\n",
                  hw->mac.type, hw->phy.type,
diff --git a/drivers/net/jme.c b/drivers/net/jme.c
index 81c6cdc3851f..a10c68700e0e 100644
--- a/drivers/net/jme.c
+++ b/drivers/net/jme.c
@@ -2862,18 +2862,10 @@ jme_init_one(struct pci_dev *pdev,
                 goto err_out_free_shadow;
         }
 
-        msg_probe(jme,
-                "JMC250 gigabit%s ver:%x rev:%x "
-                "macaddr:%02x:%02x:%02x:%02x:%02x:%02x\n",
+        msg_probe(jme, "JMC250 gigabit%s ver:%x rev:%x macaddr:%pM\n",
                 (jme->fpgaver != 0) ? " (FPGA)" : "",
                 (jme->fpgaver != 0) ? jme->fpgaver : jme->chiprev,
-                jme->rev,
-                netdev->dev_addr[0],
-                netdev->dev_addr[1],
-                netdev->dev_addr[2],
-                netdev->dev_addr[3],
-                netdev->dev_addr[4],
-                netdev->dev_addr[5]);
+                jme->rev, netdev->dev_addr);
 
         return 0;
 
diff --git a/drivers/net/ps3_gelic_wireless.c b/drivers/net/ps3_gelic_wireless.c
index c1eaeb614150..d10dc3ea9c79 100644
--- a/drivers/net/ps3_gelic_wireless.c
+++ b/drivers/net/ps3_gelic_wireless.c
@@ -1165,11 +1165,7 @@ static int gelic_wl_set_ap(struct net_device *netdev,
                        ETH_ALEN);
                 set_bit(GELIC_WL_STAT_BSSID_SET, &wl->stat);
                 set_bit(GELIC_WL_STAT_CONFIGURED, &wl->stat);
-                pr_debug("%s: bss=%02x:%02x:%02x:%02x:%02x:%02x\n",
-                         __func__,
-                         wl->bssid[0], wl->bssid[1],
-                         wl->bssid[2], wl->bssid[3],
-                         wl->bssid[4], wl->bssid[5]);
+                pr_debug("%s: bss=%pM\n", __func__, wl->bssid);
         } else {
                 pr_debug("%s: clear bssid\n", __func__);
                 clear_bit(GELIC_WL_STAT_BSSID_SET, &wl->stat);
diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c
index b83a9c9b6a97..6445d2cb1322 100644
--- a/drivers/net/qlge/qlge_main.c
+++ b/drivers/net/qlge/qlge_main.c
@@ -336,12 +336,11 @@ static int ql_set_mac_addr_reg(struct ql_adapter *qdev, u8 *addr, u32 type,
                             (addr[5]);
 
                         QPRINTK(qdev, IFUP, INFO,
-                                "Adding %s address %02x:%02x:%02x:%02x:%02x:%02x"
+                                "Adding %s address %pM"
                                 " at index %d in the CAM.\n",
                                 ((type ==
                                   MAC_ADDR_TYPE_MULTI_MAC) ? "MULTICAST" :
-                                 "UNICAST"), addr[0], addr[1], addr[2], addr[3],
-                                addr[4], addr[5], index);
+                                 "UNICAST"), addr, index);
 
                         status =
                             ql_wait_reg_rdy(qdev,
@@ -3127,11 +3126,7 @@ static void ql_display_dev_info(struct net_device *ndev)
                 qdev->chip_rev_id >> 4 & 0x0000000f,
                 qdev->chip_rev_id >> 8 & 0x0000000f,
                 qdev->chip_rev_id >> 12 & 0x0000000f);
-        QPRINTK(qdev, PROBE, INFO,
-                "MAC address %02x:%02x:%02x:%02x:%02x:%02x\n",
-                ndev->dev_addr[0], ndev->dev_addr[1],
-                ndev->dev_addr[2], ndev->dev_addr[3], ndev->dev_addr[4],
-                ndev->dev_addr[5]);
+        QPRINTK(qdev, PROBE, INFO, "MAC address %pM\n", ndev->dev_addr);
 }
 
 static int ql_adapter_down(struct ql_adapter *qdev)
diff --git a/drivers/net/wireless/wavelan_cs.c b/drivers/net/wireless/wavelan_cs.c
index 7bf445895a82..0a3bacc20d96 100644
--- a/drivers/net/wireless/wavelan_cs.c
+++ b/drivers/net/wireless/wavelan_cs.c
@@ -2235,13 +2235,7 @@ static int wavelan_set_wap(struct net_device *dev,
                            char *extra)
 {
 #ifdef DEBUG_IOCTL_INFO
-        printk(KERN_DEBUG "Set AP to : %02X:%02X:%02X:%02X:%02X:%02X\n",
-               wrqu->ap_addr.sa_data[0],
-               wrqu->ap_addr.sa_data[1],
-               wrqu->ap_addr.sa_data[2],
-               wrqu->ap_addr.sa_data[3],
-               wrqu->ap_addr.sa_data[4],
-               wrqu->ap_addr.sa_data[5]);
+        printk(KERN_DEBUG "Set AP to : %pM\n", wrqu->ap_addr.sa_data);
 #endif  /* DEBUG_IOCTL_INFO */
 
         return -EOPNOTSUPP;