diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2008-10-27 18:59:26 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-10-27 20:06:18 -0400 |
commit | e174961ca1a0b28f7abf0be47973ad57cb74e5f0 (patch) | |
tree | e8f74ecd420a0e380a71670e5aec5c2a0c15640a /drivers/net/cpmac.c | |
parent | 0c68ae2605dbcf67414d8d1f19af93be44b355fb (diff) |
net: convert print_mac to %pM
This converts pretty much everything to print_mac. There were
a few things that had conflicts which I have just dropped for
now, no harm done.
I've built an allyesconfig with this and looked at the files
that weren't built very carefully, but it's a huge patch.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/cpmac.c')
-rw-r--r-- | drivers/net/cpmac.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/cpmac.c b/drivers/net/cpmac.c index 017a5361b980..d39a77cba1af 100644 --- a/drivers/net/cpmac.c +++ b/drivers/net/cpmac.c | |||
@@ -1103,7 +1103,6 @@ static int __devinit cpmac_probe(struct platform_device *pdev) | |||
1103 | struct cpmac_priv *priv; | 1103 | struct cpmac_priv *priv; |
1104 | struct net_device *dev; | 1104 | struct net_device *dev; |
1105 | struct plat_cpmac_data *pdata; | 1105 | struct plat_cpmac_data *pdata; |
1106 | DECLARE_MAC_BUF(mac); | ||
1107 | 1106 | ||
1108 | pdata = pdev->dev.platform_data; | 1107 | pdata = pdev->dev.platform_data; |
1109 | 1108 | ||
@@ -1180,8 +1179,8 @@ static int __devinit cpmac_probe(struct platform_device *pdev) | |||
1180 | if (netif_msg_probe(priv)) { | 1179 | if (netif_msg_probe(priv)) { |
1181 | printk(KERN_INFO | 1180 | printk(KERN_INFO |
1182 | "cpmac: device %s (regs: %p, irq: %d, phy: %s, " | 1181 | "cpmac: device %s (regs: %p, irq: %d, phy: %s, " |
1183 | "mac: %s)\n", dev->name, (void *)mem->start, dev->irq, | 1182 | "mac: %pM)\n", dev->name, (void *)mem->start, dev->irq, |
1184 | priv->phy_name, print_mac(mac, dev->dev_addr)); | 1183 | priv->phy_name, dev->dev_addr); |
1185 | } | 1184 | } |
1186 | return 0; | 1185 | return 0; |
1187 | 1186 | ||