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/sis190.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/sis190.c')
-rw-r--r-- | drivers/net/sis190.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c index e6e3bf58a569..f6c8f70b405c 100644 --- a/drivers/net/sis190.c +++ b/drivers/net/sis190.c | |||
@@ -1791,7 +1791,6 @@ static int __devinit sis190_init_one(struct pci_dev *pdev, | |||
1791 | struct net_device *dev; | 1791 | struct net_device *dev; |
1792 | void __iomem *ioaddr; | 1792 | void __iomem *ioaddr; |
1793 | int rc; | 1793 | int rc; |
1794 | DECLARE_MAC_BUF(mac); | ||
1795 | 1794 | ||
1796 | if (!printed_version) { | 1795 | if (!printed_version) { |
1797 | net_drv(&debug, KERN_INFO SIS190_DRIVER_NAME " loaded.\n"); | 1796 | net_drv(&debug, KERN_INFO SIS190_DRIVER_NAME " loaded.\n"); |
@@ -1841,10 +1840,9 @@ static int __devinit sis190_init_one(struct pci_dev *pdev, | |||
1841 | if (rc < 0) | 1840 | if (rc < 0) |
1842 | goto err_remove_mii; | 1841 | goto err_remove_mii; |
1843 | 1842 | ||
1844 | net_probe(tp, KERN_INFO "%s: %s at %p (IRQ: %d), " | 1843 | net_probe(tp, KERN_INFO "%s: %s at %p (IRQ: %d), %pM\n", |
1845 | "%s\n", | ||
1846 | pci_name(pdev), sis_chip_info[ent->driver_data].name, | 1844 | pci_name(pdev), sis_chip_info[ent->driver_data].name, |
1847 | ioaddr, dev->irq, print_mac(mac, dev->dev_addr)); | 1845 | ioaddr, dev->irq, dev->dev_addr); |
1848 | 1846 | ||
1849 | net_probe(tp, KERN_INFO "%s: %s mode.\n", dev->name, | 1847 | net_probe(tp, KERN_INFO "%s: %s mode.\n", dev->name, |
1850 | (tp->features & F_HAS_RGMII) ? "RGMII" : "GMII"); | 1848 | (tp->features & F_HAS_RGMII) ? "RGMII" : "GMII"); |