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/smc-ultra.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/smc-ultra.c')
-rw-r--r-- | drivers/net/smc-ultra.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/smc-ultra.c b/drivers/net/smc-ultra.c index 00d6cf1af484..0fe0251767bb 100644 --- a/drivers/net/smc-ultra.c +++ b/drivers/net/smc-ultra.c | |||
@@ -198,7 +198,6 @@ 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); | ||
202 | 201 | ||
203 | if (!request_region(ioaddr, ULTRA_IO_EXTENT, DRV_NAME)) | 202 | if (!request_region(ioaddr, ULTRA_IO_EXTENT, DRV_NAME)) |
204 | return -EBUSY; | 203 | return -EBUSY; |
@@ -228,8 +227,8 @@ static int __init ultra_probe1(struct net_device *dev, int ioaddr) | |||
228 | for (i = 0; i < 6; i++) | 227 | for (i = 0; i < 6; i++) |
229 | dev->dev_addr[i] = inb(ioaddr + 8 + i); | 228 | dev->dev_addr[i] = inb(ioaddr + 8 + i); |
230 | 229 | ||
231 | printk("%s: %s at %#3x, %s", dev->name, model_name, | 230 | printk("%s: %s at %#3x, %pM", dev->name, model_name, |
232 | ioaddr, print_mac(mac, dev->dev_addr)); | 231 | ioaddr, dev->dev_addr); |
233 | 232 | ||
234 | /* Switch from the station address to the alternate register set and | 233 | /* Switch from the station address to the alternate register set and |
235 | read the useful registers there. */ | 234 | read the useful registers there. */ |