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/ac3200.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/ac3200.c')
-rw-r--r-- | drivers/net/ac3200.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/ac3200.c b/drivers/net/ac3200.c index b1448637107f..071a851a2ea1 100644 --- a/drivers/net/ac3200.c +++ b/drivers/net/ac3200.c | |||
@@ -146,7 +146,6 @@ out: | |||
146 | static int __init ac_probe1(int ioaddr, struct net_device *dev) | 146 | static int __init ac_probe1(int ioaddr, struct net_device *dev) |
147 | { | 147 | { |
148 | int i, retval; | 148 | int i, retval; |
149 | DECLARE_MAC_BUF(mac); | ||
150 | 149 | ||
151 | if (!request_region(ioaddr, AC_IO_EXTENT, DRV_NAME)) | 150 | if (!request_region(ioaddr, AC_IO_EXTENT, DRV_NAME)) |
152 | return -EBUSY; | 151 | return -EBUSY; |
@@ -171,8 +170,8 @@ static int __init ac_probe1(int ioaddr, struct net_device *dev) | |||
171 | for (i = 0; i < 6; i++) | 170 | for (i = 0; i < 6; i++) |
172 | dev->dev_addr[i] = inb(ioaddr + AC_SA_PROM + i); | 171 | dev->dev_addr[i] = inb(ioaddr + AC_SA_PROM + i); |
173 | 172 | ||
174 | printk(KERN_DEBUG "AC3200 in EISA slot %d, node %s", | 173 | printk(KERN_DEBUG "AC3200 in EISA slot %d, node %pM", |
175 | ioaddr/0x1000, print_mac(mac, dev->dev_addr)); | 174 | ioaddr/0x1000, dev->dev_addr); |
176 | #if 0 | 175 | #if 0 |
177 | /* Check the vendor ID/prefix. Redundant after checking the EISA ID */ | 176 | /* Check the vendor ID/prefix. Redundant after checking the EISA ID */ |
178 | if (inb(ioaddr + AC_SA_PROM + 0) != AC_ADDR0 | 177 | if (inb(ioaddr + AC_SA_PROM + 0) != AC_ADDR0 |