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/smc-ultra.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/smc-ultra.c')
-rw-r--r-- | drivers/net/smc-ultra.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/smc-ultra.c b/drivers/net/smc-ultra.c index d02bd7bc1bae..00d6cf1af484 100644 --- a/drivers/net/smc-ultra.c +++ b/drivers/net/smc-ultra.c | |||
@@ -198,6 +198,7 @@ static int __init ultra_probe1(struct net_device *dev, int ioaddr) | |||
198 | unsigned char num_pages, irqreg, addr, piomode; | 198 | unsigned char num_pages, irqreg, addr, piomode; |
199 | unsigned char idreg = inb(ioaddr + 7); | 199 | unsigned char idreg = inb(ioaddr + 7); |
200 | unsigned char reg4 = inb(ioaddr + 4) & 0x7f; | 200 | unsigned char reg4 = inb(ioaddr + 4) & 0x7f; |
201 | DECLARE_MAC_BUF(mac); | ||
201 | 202 | ||
202 | if (!request_region(ioaddr, ULTRA_IO_EXTENT, DRV_NAME)) | 203 | if (!request_region(ioaddr, ULTRA_IO_EXTENT, DRV_NAME)) |
203 | return -EBUSY; | 204 | return -EBUSY; |
@@ -224,10 +225,11 @@ static int __init ultra_probe1(struct net_device *dev, int ioaddr) | |||
224 | 225 | ||
225 | model_name = (idreg & 0xF0) == 0x20 ? "SMC Ultra" : "SMC EtherEZ"; | 226 | model_name = (idreg & 0xF0) == 0x20 ? "SMC Ultra" : "SMC EtherEZ"; |
226 | 227 | ||
227 | printk("%s: %s at %#3x,", dev->name, model_name, ioaddr); | ||
228 | |||
229 | for (i = 0; i < 6; i++) | 228 | for (i = 0; i < 6; i++) |
230 | printk(" %2.2X", dev->dev_addr[i] = inb(ioaddr + 8 + i)); | 229 | dev->dev_addr[i] = inb(ioaddr + 8 + i); |
230 | |||
231 | printk("%s: %s at %#3x, %s", dev->name, model_name, | ||
232 | ioaddr, print_mac(mac, dev->dev_addr)); | ||
231 | 233 | ||
232 | /* Switch from the station address to the alternate register set and | 234 | /* Switch from the station address to the alternate register set and |
233 | read the useful registers there. */ | 235 | read the useful registers there. */ |