diff options
author | Joe Perches <joe@perches.com> | 2007-10-03 20:59:30 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:51:42 -0400 |
commit | 0795af5729b18218767fab27c44b1384f72dc9ad (patch) | |
tree | 67c16df84aa6ec219340b8ea1b5cfb0e8150a216 /drivers/net/atp.c | |
parent | 95ea36275f3c9a1d3d04c217b4b576c657c4e70e (diff) |
[NET]: Introduce and use print_mac() and DECLARE_MAC_BUF()
This is nicer than the MAC_FMT stuff.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/atp.c')
-rw-r--r-- | drivers/net/atp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/atp.c b/drivers/net/atp.c index cec2e3672cd0..62f09e59d9c4 100644 --- a/drivers/net/atp.c +++ b/drivers/net/atp.c | |||
@@ -248,6 +248,7 @@ 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); | ||
251 | 252 | ||
252 | outb(0xff, ioaddr + PAR_DATA); | 253 | outb(0xff, ioaddr + PAR_DATA); |
253 | /* Save the original value of the Control register, in case we guessed | 254 | /* Save the original value of the Control register, in case we guessed |
@@ -322,10 +323,9 @@ static int __init atp_probe1(long ioaddr) | |||
322 | printk(KERN_INFO "%s", version); | 323 | printk(KERN_INFO "%s", version); |
323 | #endif | 324 | #endif |
324 | 325 | ||
325 | printk(KERN_NOTICE "%s: Pocket adapter found at %#3lx, IRQ %d, SAPROM " | 326 | printk(KERN_NOTICE "%s: Pocket adapter found at %#3lx, IRQ %d, " |
326 | "%02X:%02X:%02X:%02X:%02X:%02X.\n", dev->name, dev->base_addr, | 327 | "SAPROM %s.\n", |
327 | dev->irq, dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2], | 328 | dev->name, dev->base_addr, dev->irq, print_mac(mac, dev->dev_addr)); |
328 | dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]); | ||
329 | 329 | ||
330 | /* Reset the ethernet hardware and activate the printer pass-through. */ | 330 | /* Reset the ethernet hardware and activate the printer pass-through. */ |
331 | write_reg_high(ioaddr, CMR1, CMR1h_RESET | CMR1h_MUX); | 331 | write_reg_high(ioaddr, CMR1, CMR1h_RESET | CMR1h_MUX); |