Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

net: convert more to %pM

A number of places still use %02x:...:%02x because it's
in debug statements or for no real reason. Make a few
of them use %pM.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Johannes Berg and committed by
David S. Miller
7c510e4b e174961c

+50 -141
+1 -4
arch/sparc64/kernel/idprom.c
··· 42 42 idprom->id_cksum, calc_idprom_cksum(idprom)); 43 43 } 44 44 45 - printk("Ethernet address: %02x:%02x:%02x:%02x:%02x:%02x\n", 46 - idprom->id_ethaddr[0], idprom->id_ethaddr[1], 47 - idprom->id_ethaddr[2], idprom->id_ethaddr[3], 48 - idprom->id_ethaddr[4], idprom->id_ethaddr[5]); 45 + printk("Ethernet address: %pM\n", idprom->id_ethaddr); 49 46 }
+1 -6
arch/um/drivers/net_kern.c
··· 418 418 419 419 setup_etheraddr(mac, device->mac, dev->name); 420 420 421 - printk(KERN_INFO "Netdevice %d ", n); 422 - printk("(%02x:%02x:%02x:%02x:%02x:%02x) ", 423 - device->mac[0], device->mac[1], 424 - device->mac[2], device->mac[3], 425 - device->mac[4], device->mac[5]); 426 - printk(": "); 421 + printk(KERN_INFO "Netdevice %d (%pM) : ", n, device->mac); 427 422 428 423 lp = dev->priv; 429 424 /* This points to the transport private data. It's still clear, but we
+1 -4
arch/xtensa/platforms/iss/network.c
··· 660 660 661 661 printk(KERN_INFO "Netdevice %d ", index); 662 662 if (lp->have_mac) 663 - printk("(%02x:%02x:%02x:%02x:%02x:%02x) ", 664 - lp->mac[0], lp->mac[1], 665 - lp->mac[2], lp->mac[3], 666 - lp->mac[4], lp->mac[5]); 663 + printk("(%pM) ", lp->mac); 667 664 printk(": "); 668 665 669 666 /* sysfs register */
+1 -1
drivers/media/dvb/b2c2/flexcop.c
··· 270 270 /* do the MAC address reading after initializing the dvb_adapter */ 271 271 if (fc->get_mac_addr(fc, 0) == 0) { 272 272 u8 *b = fc->dvb_adapter.proposed_mac; 273 - info("MAC address = %02x:%02x:%02x:%02x:%02x:%02x", b[0],b[1],b[2],b[3],b[4],b[5]); 273 + info("MAC address = %pM", b); 274 274 flexcop_set_mac_filter(fc,b); 275 275 flexcop_mac_filter_ctrl(fc,1); 276 276 } else
+1 -3
drivers/media/dvb/bt8xx/dst.c
··· 917 917 } 918 918 memset(&state->mac_address, '\0', 8); 919 919 memcpy(&state->mac_address, &state->rxbuffer, 6); 920 - dprintk(verbose, DST_ERROR, 1, "MAC Address=[%02x:%02x:%02x:%02x:%02x:%02x]", 921 - state->mac_address[0], state->mac_address[1], state->mac_address[2], 922 - state->mac_address[4], state->mac_address[5], state->mac_address[6]); 920 + dprintk(verbose, DST_ERROR, 1, "MAC Address=[%pM]", state->mac_address); 923 921 924 922 return 0; 925 923 }
+1 -2
drivers/media/dvb/dm1105/dm1105.c
··· 697 697 }; 698 698 699 699 dm1105_i2c_xfer(&dm1105dvb->i2c_adap, msg , 2); 700 - dev_info(&dm1105dvb->pdev->dev, "MAC %02x:%02x:%02x:%02x:%02x:%02x\n", 701 - mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); 700 + dev_info(&dm1105dvb->pdev->dev, "MAC %pM\n", mac); 702 701 } 703 702 704 703 static int __devinit dm1105_probe(struct pci_dev *pdev,
+1 -4
drivers/media/dvb/dvb-usb/dvb-usb-dvb.c
··· 91 91 92 92 if (adap->dev->props.read_mac_address) { 93 93 if (adap->dev->props.read_mac_address(adap->dev,adap->dvb_adap.proposed_mac) == 0) 94 - info("MAC address: %02x:%02x:%02x:%02x:%02x:%02x",adap->dvb_adap.proposed_mac[0], 95 - adap->dvb_adap.proposed_mac[1], adap->dvb_adap.proposed_mac[2], 96 - adap->dvb_adap.proposed_mac[3], adap->dvb_adap.proposed_mac[4], 97 - adap->dvb_adap.proposed_mac[5]); 94 + info("MAC address: %pM",adap->dvb_adap.proposed_mac); 98 95 else 99 96 err("MAC address reading failed."); 100 97 }
+1 -2
drivers/media/dvb/pluto2/pluto2.c
··· 560 560 mac[4] = (val >> 8) & 0xff; 561 561 mac[5] = (val >> 0) & 0xff; 562 562 563 - dev_info(&pluto->pdev->dev, "MAC %02x:%02x:%02x:%02x:%02x:%02x\n", 564 - mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); 563 + dev_info(&pluto->pdev->dev, "MAC %pM\n", mac); 565 564 } 566 565 567 566 static int __devinit pluto_read_serial(struct pluto *pluto)
+7 -11
drivers/message/fusion/mptlan.c
··· 1462 1462 printk(KERN_INFO MYNAM ": %s: Fusion MPT LAN device " 1463 1463 "registered as '%s'\n", ioc->name, dev->name); 1464 1464 printk(KERN_INFO MYNAM ": %s/%s: " 1465 - "LanAddr = %02X:%02X:%02X:%02X:%02X:%02X\n", 1465 + "LanAddr = %pM\n", 1466 1466 IOC_AND_NETDEV_NAMES_s_s(dev), 1467 - dev->dev_addr[0], dev->dev_addr[1], 1468 - dev->dev_addr[2], dev->dev_addr[3], 1469 - dev->dev_addr[4], dev->dev_addr[5]); 1467 + dev->dev_addr); 1470 1468 1471 1469 ioc->netdev = dev; 1472 1470 ··· 1549 1551 1550 1552 printk (KERN_WARNING MYNAM ": %s: WARNING - Broadcast swap F/W bug detected!\n", 1551 1553 NETDEV_PTR_TO_IOC_NAME_s(dev)); 1552 - printk (KERN_WARNING MYNAM ": Please update sender @ MAC_addr = %02x:%02x:%02x:%02x:%02x:%02x\n", 1553 - fch->saddr[0], fch->saddr[1], fch->saddr[2], 1554 - fch->saddr[3], fch->saddr[4], fch->saddr[5]); 1554 + printk (KERN_WARNING MYNAM ": Please update sender @ MAC_addr = %pM\n", 1555 + fch->saddr); 1555 1556 } 1556 1557 1557 1558 if (*fch->daddr & 1) { ··· 1625 1628 nh->NAA = source_naa; /* Set the S_NAA value. */ 1626 1629 for (i = 0; i < FC_ALEN; i++) 1627 1630 nh->ieee[i] = fch->saddr[i]; 1628 - dlprintk ((KERN_INFO "Got ARP from %02x:%02x:%02x:%02x:" 1629 - "%02x:%02x with non-compliant S_NAA value.\n", 1630 - fch->saddr[0], fch->saddr[1], fch->saddr[2], 1631 - fch->saddr[3], fch->saddr[4],fch->saddr[5])); 1631 + dlprintk ((KERN_INFO "Got ARP from %pM with" 1632 + " non-compliant S_NAA value.\n", 1633 + fch->saddr)); 1632 1634 } else { 1633 1635 printk (KERN_ERR "mptlan/type_trans: Unable to" 1634 1636 " kmalloc a NAA_Hosed struct.\n");
+2 -5
drivers/net/bnx2x_main.c
··· 9851 9851 mclist && (i < dev->mc_count); 9852 9852 i++, mclist = mclist->next) { 9853 9853 9854 - DP(NETIF_MSG_IFUP, "Adding mcast MAC: " 9855 - "%02x:%02x:%02x:%02x:%02x:%02x\n", 9856 - mclist->dmi_addr[0], mclist->dmi_addr[1], 9857 - mclist->dmi_addr[2], mclist->dmi_addr[3], 9858 - mclist->dmi_addr[4], mclist->dmi_addr[5]); 9854 + DP(NETIF_MSG_IFUP, "Adding mcast MAC: %pM\n", 9855 + mclist->dmi_addr); 9859 9856 9860 9857 crc = crc32c_le(0, mclist->dmi_addr, ETH_ALEN); 9861 9858 bit = (crc >> 24) & 0xff;
+1 -4
drivers/net/de620.c
··· 875 875 if (de620_debug) { 876 876 printk("\nEEPROM contents:\n"); 877 877 printk("RAM_Size = 0x%02X\n", nic_data.RAM_Size); 878 - printk("NodeID = %02X:%02X:%02X:%02X:%02X:%02X\n", 879 - nic_data.NodeID[0], nic_data.NodeID[1], 880 - nic_data.NodeID[2], nic_data.NodeID[3], 881 - nic_data.NodeID[4], nic_data.NodeID[5]); 878 + printk("NodeID = %pM\n", nic_data.NodeID); 882 879 printk("Model = %d\n", nic_data.Model); 883 880 printk("Media = %d\n", nic_data.Media); 884 881 printk("SCR = 0x%02x\n", nic_data.SCR);
+3 -8
drivers/net/e1000e/netdev.c
··· 4652 4652 u32 pba_num; 4653 4653 4654 4654 /* print bus type/speed/width info */ 4655 - e_info("(PCI Express:2.5GB/s:%s) %02x:%02x:%02x:%02x:%02x:%02x\n", 4655 + e_info("(PCI Express:2.5GB/s:%s) %pM\n", 4656 4656 /* bus width */ 4657 4657 ((hw->bus.width == e1000_bus_width_pcie_x4) ? "Width x4" : 4658 4658 "Width x1"), 4659 4659 /* MAC address */ 4660 - netdev->dev_addr[0], netdev->dev_addr[1], 4661 - netdev->dev_addr[2], netdev->dev_addr[3], 4662 - netdev->dev_addr[4], netdev->dev_addr[5]); 4660 + netdev->dev_addr); 4663 4661 e_info("Intel(R) PRO/%s Network Connection\n", 4664 4662 (hw->phy.type == e1000_phy_ife) ? "10/100" : "1000"); 4665 4663 e1000e_read_pba_num(hw, &pba_num); ··· 4904 4906 memcpy(netdev->perm_addr, adapter->hw.mac.addr, netdev->addr_len); 4905 4907 4906 4908 if (!is_valid_ether_addr(netdev->perm_addr)) { 4907 - e_err("Invalid MAC Address: %02x:%02x:%02x:%02x:%02x:%02x\n", 4908 - netdev->perm_addr[0], netdev->perm_addr[1], 4909 - netdev->perm_addr[2], netdev->perm_addr[3], 4910 - netdev->perm_addr[4], netdev->perm_addr[5]); 4909 + e_err("Invalid MAC Address: %pM\n", netdev->perm_addr); 4911 4910 err = -EIO; 4912 4911 goto err_eeprom; 4913 4912 }
+2 -5
drivers/net/enic/enic_res.c
··· 90 90 91 91 c->intr_timer = min_t(u16, VNIC_INTR_TIMER_MAX, c->intr_timer); 92 92 93 - printk(KERN_INFO PFX "vNIC MAC addr %02x:%02x:%02x:%02x:%02x:%02x " 94 - "wq/rq %d/%d\n", 95 - enic->mac_addr[0], enic->mac_addr[1], enic->mac_addr[2], 96 - enic->mac_addr[3], enic->mac_addr[4], enic->mac_addr[5], 97 - c->wq_desc_count, c->rq_desc_count); 93 + printk(KERN_INFO PFX "vNIC MAC addr %pM wq/rq %d/%d\n", 94 + enic->mac_addr, c->wq_desc_count, c->rq_desc_count); 98 95 printk(KERN_INFO PFX "vNIC mtu %d csum tx/rx %d/%d tso/lro %d/%d " 99 96 "intr timer %d\n", 100 97 c->mtu, ENIC_SETTING(enic, TXCSUM),
+2 -8
drivers/net/enic/vnic_dev.c
··· 489 489 490 490 err = vnic_dev_cmd(vdev, CMD_ADDR_ADD, &a0, &a1, wait); 491 491 if (err) 492 - printk(KERN_ERR 493 - "Can't add addr [%02x:%02x:%02x:%02x:%02x:%02x], %d\n", 494 - addr[0], addr[1], addr[2], addr[3], addr[4], addr[5], 495 - err); 492 + printk(KERN_ERR "Can't add addr [%pM], %d\n", addr, err); 496 493 } 497 494 498 495 void vnic_dev_del_addr(struct vnic_dev *vdev, u8 *addr) ··· 504 507 505 508 err = vnic_dev_cmd(vdev, CMD_ADDR_DEL, &a0, &a1, wait); 506 509 if (err) 507 - printk(KERN_ERR 508 - "Can't del addr [%02x:%02x:%02x:%02x:%02x:%02x], %d\n", 509 - addr[0], addr[1], addr[2], addr[3], addr[4], addr[5], 510 - err); 510 + printk(KERN_ERR "Can't del addr [%pM], %d\n", addr, err); 511 511 } 512 512 513 513 int vnic_dev_notify_set(struct vnic_dev *vdev, u16 intr)
+1 -4
drivers/net/fs_enet/fs_enet-main.c
··· 1115 1115 if (ret) 1116 1116 goto out_free_bd; 1117 1117 1118 - printk(KERN_INFO "%s: fs_enet: %02x:%02x:%02x:%02x:%02x:%02x\n", 1119 - ndev->name, 1120 - ndev->dev_addr[0], ndev->dev_addr[1], ndev->dev_addr[2], 1121 - ndev->dev_addr[3], ndev->dev_addr[4], ndev->dev_addr[5]); 1118 + printk(KERN_INFO "%s: fs_enet: %pM\n", ndev->name, ndev->dev_addr); 1122 1119 1123 1120 return 0; 1124 1121
+3 -8
drivers/net/ibm_newemac/core.c
··· 396 396 397 397 for (dmi = dev->ndev->mc_list; dmi; dmi = dmi->next) { 398 398 int slot, reg, mask; 399 - DBG2(dev, "mc %02x:%02x:%02x:%02x:%02x:%02x" NL, 400 - dmi->dmi_addr[0], dmi->dmi_addr[1], dmi->dmi_addr[2], 401 - dmi->dmi_addr[3], dmi->dmi_addr[4], dmi->dmi_addr[5]); 399 + DBG2(dev, "mc %pM" NL, dmi->dmi_addr); 402 400 403 401 slot = EMAC_XAHT_CRC_TO_SLOT(dev, ether_crc(ETH_ALEN, dmi->dmi_addr)); 404 402 reg = EMAC_XAHT_SLOT_TO_REG(dev, slot); ··· 2863 2865 wake_up_all(&emac_probe_wait); 2864 2866 2865 2867 2866 - printk(KERN_INFO 2867 - "%s: EMAC-%d %s, MAC %02x:%02x:%02x:%02x:%02x:%02x\n", 2868 - ndev->name, dev->cell_index, np->full_name, 2869 - ndev->dev_addr[0], ndev->dev_addr[1], ndev->dev_addr[2], 2870 - ndev->dev_addr[3], ndev->dev_addr[4], ndev->dev_addr[5]); 2868 + printk(KERN_INFO "%s: EMAC-%d %s, MAC %pM\n", 2869 + ndev->name, dev->cell_index, np->full_name, ndev->dev_addr); 2871 2870 2872 2871 if (dev->phy_mode == PHY_MODE_SGMII) 2873 2872 printk(KERN_NOTICE "%s: in SGMII mode\n", ndev->name);
+2 -4
drivers/net/igb/igb_main.c
··· 1275 1275 1276 1276 dev_info(&pdev->dev, "Intel(R) Gigabit Ethernet Network Connection\n"); 1277 1277 /* print bus type/speed/width info */ 1278 - dev_info(&pdev->dev, 1279 - "%s: (PCIe:%s:%s) %02x:%02x:%02x:%02x:%02x:%02x\n", 1278 + dev_info(&pdev->dev, "%s: (PCIe:%s:%s) %pM\n", 1280 1279 netdev->name, 1281 1280 ((hw->bus.speed == e1000_bus_speed_2500) 1282 1281 ? "2.5Gb/s" : "unknown"), 1283 1282 ((hw->bus.width == e1000_bus_width_pcie_x4) 1284 1283 ? "Width x4" : (hw->bus.width == e1000_bus_width_pcie_x1) 1285 1284 ? "Width x1" : "unknown"), 1286 - netdev->dev_addr[0], netdev->dev_addr[1], netdev->dev_addr[2], 1287 - netdev->dev_addr[3], netdev->dev_addr[4], netdev->dev_addr[5]); 1285 + netdev->dev_addr); 1288 1286 1289 1287 igb_read_part_num(hw, &part_num); 1290 1288 dev_info(&pdev->dev, "%s: PBA No: %06x-%03x\n", netdev->name,
+2 -5
drivers/net/ioc3-eth.c
··· 390 390 } 391 391 392 392 printk("Found %s NIC", type); 393 - if (type != unknown) { 394 - printk (" registration number %02x:%02x:%02x:%02x:%02x:%02x," 395 - " CRC %02x", serial[0], serial[1], serial[2], 396 - serial[3], serial[4], serial[5], crc); 397 - } 393 + if (type != unknown) 394 + printk (" registration number %pM, CRC %02x", serial, crc); 398 395 printk(".\n"); 399 396 400 397 return 0;
+2 -4
drivers/net/ixgbe/ixgbe_main.c
··· 3877 3877 pci_read_config_word(pdev, IXGBE_PCI_LINK_STATUS, &link_status); 3878 3878 link_speed = link_status & IXGBE_PCI_LINK_SPEED; 3879 3879 link_width = link_status & IXGBE_PCI_LINK_WIDTH; 3880 - dev_info(&pdev->dev, "(PCI Express:%s:%s) " 3881 - "%02x:%02x:%02x:%02x:%02x:%02x\n", 3880 + dev_info(&pdev->dev, "(PCI Express:%s:%s) %pM\n", 3882 3881 ((link_speed == IXGBE_PCI_LINK_SPEED_5000) ? "5.0Gb/s" : 3883 3882 (link_speed == IXGBE_PCI_LINK_SPEED_2500) ? "2.5Gb/s" : 3884 3883 "Unknown"), ··· 3886 3887 (link_width == IXGBE_PCI_LINK_WIDTH_2) ? "Width x2" : 3887 3888 (link_width == IXGBE_PCI_LINK_WIDTH_1) ? "Width x1" : 3888 3889 "Unknown"), 3889 - netdev->dev_addr[0], netdev->dev_addr[1], netdev->dev_addr[2], 3890 - netdev->dev_addr[3], netdev->dev_addr[4], netdev->dev_addr[5]); 3890 + netdev->dev_addr); 3891 3891 ixgbe_read_pba_num_generic(hw, &part_num); 3892 3892 dev_info(&pdev->dev, "MAC: %d, PHY: %d, PBA No: %06x-%03x\n", 3893 3893 hw->mac.type, hw->phy.type,
+2 -10
drivers/net/jme.c
··· 2862 2862 goto err_out_free_shadow; 2863 2863 } 2864 2864 2865 - msg_probe(jme, 2866 - "JMC250 gigabit%s ver:%x rev:%x " 2867 - "macaddr:%02x:%02x:%02x:%02x:%02x:%02x\n", 2865 + msg_probe(jme, "JMC250 gigabit%s ver:%x rev:%x macaddr:%pM\n", 2868 2866 (jme->fpgaver != 0) ? " (FPGA)" : "", 2869 2867 (jme->fpgaver != 0) ? jme->fpgaver : jme->chiprev, 2870 - jme->rev, 2871 - netdev->dev_addr[0], 2872 - netdev->dev_addr[1], 2873 - netdev->dev_addr[2], 2874 - netdev->dev_addr[3], 2875 - netdev->dev_addr[4], 2876 - netdev->dev_addr[5]); 2868 + jme->rev, netdev->dev_addr); 2877 2869 2878 2870 return 0; 2879 2871
+1 -5
drivers/net/ps3_gelic_wireless.c
··· 1165 1165 ETH_ALEN); 1166 1166 set_bit(GELIC_WL_STAT_BSSID_SET, &wl->stat); 1167 1167 set_bit(GELIC_WL_STAT_CONFIGURED, &wl->stat); 1168 - pr_debug("%s: bss=%02x:%02x:%02x:%02x:%02x:%02x\n", 1169 - __func__, 1170 - wl->bssid[0], wl->bssid[1], 1171 - wl->bssid[2], wl->bssid[3], 1172 - wl->bssid[4], wl->bssid[5]); 1168 + pr_debug("%s: bss=%pM\n", __func__, wl->bssid); 1173 1169 } else { 1174 1170 pr_debug("%s: clear bssid\n", __func__); 1175 1171 clear_bit(GELIC_WL_STAT_BSSID_SET, &wl->stat);
+3 -8
drivers/net/qlge/qlge_main.c
··· 336 336 (addr[5]); 337 337 338 338 QPRINTK(qdev, IFUP, INFO, 339 - "Adding %s address %02x:%02x:%02x:%02x:%02x:%02x" 339 + "Adding %s address %pM" 340 340 " at index %d in the CAM.\n", 341 341 ((type == 342 342 MAC_ADDR_TYPE_MULTI_MAC) ? "MULTICAST" : 343 - "UNICAST"), addr[0], addr[1], addr[2], addr[3], 344 - addr[4], addr[5], index); 343 + "UNICAST"), addr, index); 345 344 346 345 status = 347 346 ql_wait_reg_rdy(qdev, ··· 3126 3127 qdev->chip_rev_id >> 4 & 0x0000000f, 3127 3128 qdev->chip_rev_id >> 8 & 0x0000000f, 3128 3129 qdev->chip_rev_id >> 12 & 0x0000000f); 3129 - QPRINTK(qdev, PROBE, INFO, 3130 - "MAC address %02x:%02x:%02x:%02x:%02x:%02x\n", 3131 - ndev->dev_addr[0], ndev->dev_addr[1], 3132 - ndev->dev_addr[2], ndev->dev_addr[3], ndev->dev_addr[4], 3133 - ndev->dev_addr[5]); 3130 + QPRINTK(qdev, PROBE, INFO, "MAC address %pM\n", ndev->dev_addr); 3134 3131 } 3135 3132 3136 3133 static int ql_adapter_down(struct ql_adapter *qdev)
+1 -7
drivers/net/wireless/wavelan_cs.c
··· 2235 2235 char *extra) 2236 2236 { 2237 2237 #ifdef DEBUG_IOCTL_INFO 2238 - printk(KERN_DEBUG "Set AP to : %02X:%02X:%02X:%02X:%02X:%02X\n", 2239 - wrqu->ap_addr.sa_data[0], 2240 - wrqu->ap_addr.sa_data[1], 2241 - wrqu->ap_addr.sa_data[2], 2242 - wrqu->ap_addr.sa_data[3], 2243 - wrqu->ap_addr.sa_data[4], 2244 - wrqu->ap_addr.sa_data[5]); 2238 + printk(KERN_DEBUG "Set AP to : %pM\n", wrqu->ap_addr.sa_data); 2245 2239 #endif /* DEBUG_IOCTL_INFO */ 2246 2240 2247 2241 return -EOPNOTSUPP;
+6 -12
drivers/s390/net/qeth_l2_main.c
··· 131 131 mac = &cmd->data.setdelmac.mac[0]; 132 132 /* MAC already registered, needed in couple/uncouple case */ 133 133 if (cmd->hdr.return_code == 0x2005) { 134 - QETH_DBF_MESSAGE(2, "Group MAC %02x:%02x:%02x:%02x:%02x:%02x " 135 - "already existing on %s \n", 136 - mac[0], mac[1], mac[2], mac[3], mac[4], mac[5], 137 - QETH_CARD_IFNAME(card)); 134 + QETH_DBF_MESSAGE(2, "Group MAC %pM already existing on %s \n", 135 + mac, QETH_CARD_IFNAME(card)); 138 136 cmd->hdr.return_code = 0; 139 137 } 140 138 if (cmd->hdr.return_code) 141 - QETH_DBF_MESSAGE(2, "Could not set group MAC " 142 - "%02x:%02x:%02x:%02x:%02x:%02x on %s: %x\n", 143 - mac[0], mac[1], mac[2], mac[3], mac[4], mac[5], 144 - QETH_CARD_IFNAME(card), cmd->hdr.return_code); 139 + QETH_DBF_MESSAGE(2, "Could not set group MAC %pM on %s: %x\n", 140 + mac, QETH_CARD_IFNAME(card), cmd->hdr.return_code); 145 141 return 0; 146 142 } 147 143 ··· 159 163 cmd = (struct qeth_ipa_cmd *) data; 160 164 mac = &cmd->data.setdelmac.mac[0]; 161 165 if (cmd->hdr.return_code) 162 - QETH_DBF_MESSAGE(2, "Could not delete group MAC " 163 - "%02x:%02x:%02x:%02x:%02x:%02x on %s: %x\n", 164 - mac[0], mac[1], mac[2], mac[3], mac[4], mac[5], 165 - QETH_CARD_IFNAME(card), cmd->hdr.return_code); 166 + QETH_DBF_MESSAGE(2, "Could not delete group MAC %pM on %s: %x\n", 167 + mac, QETH_CARD_IFNAME(card), cmd->hdr.return_code); 166 168 return 0; 167 169 } 168 170
+1 -3
drivers/usb/atm/cxacru.c
··· 286 286 struct usbatm_data *usbatm_instance = usb_get_intfdata(intf); 287 287 struct atm_dev *atm_dev = usbatm_instance->atm_dev; 288 288 289 - return snprintf(buf, PAGE_SIZE, "%02x:%02x:%02x:%02x:%02x:%02x\n", 290 - atm_dev->esi[0], atm_dev->esi[1], atm_dev->esi[2], 291 - atm_dev->esi[3], atm_dev->esi[4], atm_dev->esi[5]); 289 + return snprintf(buf, PAGE_SIZE, "%pM\n", atm_dev->esi); 292 290 } 293 291 294 292 static ssize_t cxacru_sysfs_show_adsl_state(struct device *dev,
+1 -4
drivers/usb/atm/usbatm.c
··· 770 770 return sprintf(page, "%s\n", instance->description); 771 771 772 772 if (!left--) 773 - return sprintf(page, "MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", 774 - atm_dev->esi[0], atm_dev->esi[1], 775 - atm_dev->esi[2], atm_dev->esi[3], 776 - atm_dev->esi[4], atm_dev->esi[5]); 773 + return sprintf(page, "MAC: %pM\n", atm_dev->esi); 777 774 778 775 if (!left--) 779 776 return sprintf(page,