diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2008-10-27 20:47:26 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-10-27 20:47:26 -0400 |
commit | 7c510e4b730a92cecf94ada45c989d8be0200d47 (patch) | |
tree | 61f1926964c580946367588602a8eb039561f077 /drivers/net/ibm_newemac | |
parent | e174961ca1a0b28f7abf0be47973ad57cb74e5f0 (diff) |
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>
Diffstat (limited to 'drivers/net/ibm_newemac')
-rw-r--r-- | drivers/net/ibm_newemac/core.c | 11 |
1 files changed, 3 insertions, 8 deletions
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) | |||
396 | 396 | ||
397 | for (dmi = dev->ndev->mc_list; dmi; dmi = dmi->next) { | 397 | for (dmi = dev->ndev->mc_list; dmi; dmi = dmi->next) { |
398 | int slot, reg, mask; | 398 | int slot, reg, mask; |
399 | DBG2(dev, "mc %02x:%02x:%02x:%02x:%02x:%02x" NL, | 399 | DBG2(dev, "mc %pM" NL, dmi->dmi_addr); |
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]); | ||
402 | 400 | ||
403 | slot = EMAC_XAHT_CRC_TO_SLOT(dev, ether_crc(ETH_ALEN, dmi->dmi_addr)); | 401 | slot = EMAC_XAHT_CRC_TO_SLOT(dev, ether_crc(ETH_ALEN, dmi->dmi_addr)); |
404 | reg = EMAC_XAHT_SLOT_TO_REG(dev, slot); | 402 | reg = EMAC_XAHT_SLOT_TO_REG(dev, slot); |
@@ -2865,11 +2863,8 @@ static int __devinit emac_probe(struct of_device *ofdev, | |||
2865 | wake_up_all(&emac_probe_wait); | 2863 | wake_up_all(&emac_probe_wait); |
2866 | 2864 | ||
2867 | 2865 | ||
2868 | printk(KERN_INFO | 2866 | printk(KERN_INFO "%s: EMAC-%d %s, MAC %pM\n", |
2869 | "%s: EMAC-%d %s, MAC %02x:%02x:%02x:%02x:%02x:%02x\n", | 2867 | ndev->name, dev->cell_index, np->full_name, ndev->dev_addr); |
2870 | ndev->name, dev->cell_index, np->full_name, | ||
2871 | ndev->dev_addr[0], ndev->dev_addr[1], ndev->dev_addr[2], | ||
2872 | ndev->dev_addr[3], ndev->dev_addr[4], ndev->dev_addr[5]); | ||
2873 | 2868 | ||
2874 | if (dev->phy_mode == PHY_MODE_SGMII) | 2869 | if (dev->phy_mode == PHY_MODE_SGMII) |
2875 | printk(KERN_NOTICE "%s: in SGMII mode\n", ndev->name); | 2870 | printk(KERN_NOTICE "%s: in SGMII mode\n", ndev->name); |