aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/macb.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2008-10-27 18:59:26 -0400
committerDavid S. Miller <davem@davemloft.net>2008-10-27 20:06:18 -0400
commite174961ca1a0b28f7abf0be47973ad57cb74e5f0 (patch)
treee8f74ecd420a0e380a71670e5aec5c2a0c15640a /drivers/net/macb.c
parent0c68ae2605dbcf67414d8d1f19af93be44b355fb (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/macb.c')
-rw-r--r--drivers/net/macb.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index 01f7a31bac76..e00c896d0c9b 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -1104,7 +1104,6 @@ static int __init macb_probe(struct platform_device *pdev)
1104 unsigned long pclk_hz; 1104 unsigned long pclk_hz;
1105 u32 config; 1105 u32 config;
1106 int err = -ENXIO; 1106 int err = -ENXIO;
1107 DECLARE_MAC_BUF(mac);
1108 1107
1109 regs = platform_get_resource(pdev, IORESOURCE_MEM, 0); 1108 regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
1110 if (!regs) { 1109 if (!regs) {
@@ -1223,10 +1222,8 @@ static int __init macb_probe(struct platform_device *pdev)
1223 1222
1224 platform_set_drvdata(pdev, dev); 1223 platform_set_drvdata(pdev, dev);
1225 1224
1226 printk(KERN_INFO "%s: Atmel MACB at 0x%08lx irq %d " 1225 printk(KERN_INFO "%s: Atmel MACB at 0x%08lx irq %d (%pM)\n",
1227 "(%s)\n", 1226 dev->name, dev->base_addr, dev->irq, dev->dev_addr);
1228 dev->name, dev->base_addr, dev->irq,
1229 print_mac(mac, dev->dev_addr));
1230 1227
1231 phydev = bp->phy_dev; 1228 phydev = bp->phy_dev;
1232 printk(KERN_INFO "%s: attached PHY driver [%s] " 1229 printk(KERN_INFO "%s: attached PHY driver [%s] "