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-mca.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-mca.c')
-rw-r--r-- | drivers/net/smc-mca.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/smc-mca.c b/drivers/net/smc-mca.c index d6abb68e6e2f..58a0e0a4a325 100644 --- a/drivers/net/smc-mca.c +++ b/drivers/net/smc-mca.c | |||
@@ -196,7 +196,6 @@ static int __init ultramca_probe(struct device *gen_dev) | |||
196 | int tirq = 0; | 196 | int tirq = 0; |
197 | int base_addr = ultra_io[ultra_found]; | 197 | int base_addr = ultra_io[ultra_found]; |
198 | int irq = ultra_irq[ultra_found]; | 198 | int irq = ultra_irq[ultra_found]; |
199 | DECLARE_MAC_BUF(mac); | ||
200 | 199 | ||
201 | if (base_addr || irq) { | 200 | if (base_addr || irq) { |
202 | printk(KERN_INFO "Probing for SMC MCA adapter"); | 201 | printk(KERN_INFO "Probing for SMC MCA adapter"); |
@@ -334,8 +333,8 @@ static int __init ultramca_probe(struct device *gen_dev) | |||
334 | for (i = 0; i < 6; i++) | 333 | for (i = 0; i < 6; i++) |
335 | dev->dev_addr[i] = inb(ioaddr + 8 + i); | 334 | dev->dev_addr[i] = inb(ioaddr + 8 + i); |
336 | 335 | ||
337 | printk(KERN_INFO "smc_mca[%d]: Parameters: %#3x, %s", | 336 | printk(KERN_INFO "smc_mca[%d]: Parameters: %#3x, %pM", |
338 | slot + 1, ioaddr, print_mac(mac, dev->dev_addr)); | 337 | slot + 1, ioaddr, dev->dev_addr); |
339 | 338 | ||
340 | /* Switch from the station address to the alternate register set | 339 | /* Switch from the station address to the alternate register set |
341 | * and read the useful registers there. | 340 | * and read the useful registers there. |