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/sis900.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/sis900.c')
-rw-r--r-- | drivers/net/sis900.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c index fa3a460f8e2..bb7056a897b 100644 --- a/drivers/net/sis900.c +++ b/drivers/net/sis900.c | |||
@@ -404,7 +404,6 @@ static int __devinit sis900_probe(struct pci_dev *pci_dev, | |||
404 | int i, ret; | 404 | int i, ret; |
405 | const char *card_name = card_names[pci_id->driver_data]; | 405 | const char *card_name = card_names[pci_id->driver_data]; |
406 | const char *dev_name = pci_name(pci_dev); | 406 | const char *dev_name = pci_name(pci_dev); |
407 | DECLARE_MAC_BUF(mac); | ||
408 | 407 | ||
409 | /* when built into the kernel, we only print version if device is found */ | 408 | /* when built into the kernel, we only print version if device is found */ |
410 | #ifndef MODULE | 409 | #ifndef MODULE |
@@ -534,9 +533,9 @@ static int __devinit sis900_probe(struct pci_dev *pci_dev, | |||
534 | goto err_unmap_rx; | 533 | goto err_unmap_rx; |
535 | 534 | ||
536 | /* print some information about our NIC */ | 535 | /* print some information about our NIC */ |
537 | printk(KERN_INFO "%s: %s at %#lx, IRQ %d, %s\n", | 536 | printk(KERN_INFO "%s: %s at %#lx, IRQ %d, %pM\n", |
538 | net_dev->name, card_name, ioaddr, net_dev->irq, | 537 | net_dev->name, card_name, ioaddr, net_dev->irq, |
539 | print_mac(mac, net_dev->dev_addr)); | 538 | net_dev->dev_addr); |
540 | 539 | ||
541 | /* Detect Wake on Lan support */ | 540 | /* Detect Wake on Lan support */ |
542 | ret = (inl(net_dev->base_addr + CFGPMC) & PMESP) >> 27; | 541 | ret = (inl(net_dev->base_addr + CFGPMC) & PMESP) >> 27; |