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