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/3c503.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/3c503.c')
-rw-r--r-- | drivers/net/3c503.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/3c503.c b/drivers/net/3c503.c index 900b0ffdcc68..95bd95f1f99e 100644 --- a/drivers/net/3c503.c +++ b/drivers/net/3c503.c | |||
@@ -177,7 +177,6 @@ el2_probe1(struct net_device *dev, int ioaddr) | |||
177 | int i, iobase_reg, membase_reg, saved_406, wordlength, retval; | 177 | int i, iobase_reg, membase_reg, saved_406, wordlength, retval; |
178 | static unsigned version_printed; | 178 | static unsigned version_printed; |
179 | unsigned long vendor_id; | 179 | unsigned long vendor_id; |
180 | DECLARE_MAC_BUF(mac); | ||
181 | 180 | ||
182 | if (!request_region(ioaddr, EL2_IO_EXTENT, DRV_NAME)) | 181 | if (!request_region(ioaddr, EL2_IO_EXTENT, DRV_NAME)) |
183 | return -EBUSY; | 182 | return -EBUSY; |
@@ -228,7 +227,7 @@ el2_probe1(struct net_device *dev, int ioaddr) | |||
228 | /* Retrieve and print the ethernet address. */ | 227 | /* Retrieve and print the ethernet address. */ |
229 | for (i = 0; i < 6; i++) | 228 | for (i = 0; i < 6; i++) |
230 | dev->dev_addr[i] = inb(ioaddr + i); | 229 | dev->dev_addr[i] = inb(ioaddr + i); |
231 | printk("%s", print_mac(mac, dev->dev_addr)); | 230 | printk("%pM", dev->dev_addr); |
232 | 231 | ||
233 | /* Map the 8390 back into the window. */ | 232 | /* Map the 8390 back into the window. */ |
234 | outb(ECNTRL_THIN, ioaddr + 0x406); | 233 | outb(ECNTRL_THIN, ioaddr + 0x406); |