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/wd.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/wd.c')
-rw-r--r-- | drivers/net/wd.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/wd.c b/drivers/net/wd.c index cef365881ac2..fa14255282af 100644 --- a/drivers/net/wd.c +++ b/drivers/net/wd.c | |||
@@ -156,6 +156,7 @@ static int __init wd_probe1(struct net_device *dev, int ioaddr) | |||
156 | int word16 = 0; /* 0 = 8 bit, 1 = 16 bit */ | 156 | int word16 = 0; /* 0 = 8 bit, 1 = 16 bit */ |
157 | const char *model_name; | 157 | const char *model_name; |
158 | static unsigned version_printed; | 158 | static unsigned version_printed; |
159 | DECLARE_MAC_BUF(mac); | ||
159 | 160 | ||
160 | for (i = 0; i < 8; i++) | 161 | for (i = 0; i < 8; i++) |
161 | checksum += inb(ioaddr + 8 + i); | 162 | checksum += inb(ioaddr + 8 + i); |
@@ -174,9 +175,11 @@ static int __init wd_probe1(struct net_device *dev, int ioaddr) | |||
174 | if (ei_debug && version_printed++ == 0) | 175 | if (ei_debug && version_printed++ == 0) |
175 | printk(version); | 176 | printk(version); |
176 | 177 | ||
177 | printk("%s: WD80x3 at %#3x,", dev->name, ioaddr); | ||
178 | for (i = 0; i < 6; i++) | 178 | for (i = 0; i < 6; i++) |
179 | printk(" %2.2X", dev->dev_addr[i] = inb(ioaddr + 8 + i)); | 179 | dev->dev_addr[i] = inb(ioaddr + 8 + i); |
180 | |||
181 | printk("%s: WD80x3 at %#3x, %s", | ||
182 | dev->name, ioaddr, print_mac(mac, dev->dev_addr)); | ||
180 | 183 | ||
181 | /* The following PureData probe code was contributed by | 184 | /* The following PureData probe code was contributed by |
182 | Mike Jagdis <jaggy@purplet.demon.co.uk>. Puredata does software | 185 | Mike Jagdis <jaggy@purplet.demon.co.uk>. Puredata does software |