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/atp.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/atp.c')
-rw-r--r-- | drivers/net/atp.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/atp.c b/drivers/net/atp.c index c10cd8058e23..405c2dc5f3e4 100644 --- a/drivers/net/atp.c +++ b/drivers/net/atp.c | |||
@@ -248,7 +248,6 @@ static int __init atp_probe1(long ioaddr) | |||
248 | struct net_local *lp; | 248 | struct net_local *lp; |
249 | int saved_ctrl_reg, status, i; | 249 | int saved_ctrl_reg, status, i; |
250 | int res; | 250 | int res; |
251 | DECLARE_MAC_BUF(mac); | ||
252 | 251 | ||
253 | outb(0xff, ioaddr + PAR_DATA); | 252 | outb(0xff, ioaddr + PAR_DATA); |
254 | /* Save the original value of the Control register, in case we guessed | 253 | /* Save the original value of the Control register, in case we guessed |
@@ -324,8 +323,8 @@ static int __init atp_probe1(long ioaddr) | |||
324 | #endif | 323 | #endif |
325 | 324 | ||
326 | printk(KERN_NOTICE "%s: Pocket adapter found at %#3lx, IRQ %d, " | 325 | printk(KERN_NOTICE "%s: Pocket adapter found at %#3lx, IRQ %d, " |
327 | "SAPROM %s.\n", | 326 | "SAPROM %pM.\n", |
328 | dev->name, dev->base_addr, dev->irq, print_mac(mac, dev->dev_addr)); | 327 | dev->name, dev->base_addr, dev->irq, dev->dev_addr); |
329 | 328 | ||
330 | /* Reset the ethernet hardware and activate the printer pass-through. */ | 329 | /* Reset the ethernet hardware and activate the printer pass-through. */ |
331 | write_reg_high(ioaddr, CMR1, CMR1h_RESET | CMR1h_MUX); | 330 | write_reg_high(ioaddr, CMR1, CMR1h_RESET | CMR1h_MUX); |