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/pasemi_mac.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/pasemi_mac.c')
-rw-r--r-- | drivers/net/pasemi_mac.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/pasemi_mac.c b/drivers/net/pasemi_mac.c index edc0fd588985..b0270052c3a9 100644 --- a/drivers/net/pasemi_mac.c +++ b/drivers/net/pasemi_mac.c | |||
@@ -1742,7 +1742,6 @@ pasemi_mac_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
1742 | struct net_device *dev; | 1742 | struct net_device *dev; |
1743 | struct pasemi_mac *mac; | 1743 | struct pasemi_mac *mac; |
1744 | int err; | 1744 | int err; |
1745 | DECLARE_MAC_BUF(mac_buf); | ||
1746 | 1745 | ||
1747 | err = pci_enable_device(pdev); | 1746 | err = pci_enable_device(pdev); |
1748 | if (err) | 1747 | if (err) |
@@ -1849,9 +1848,9 @@ pasemi_mac_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
1849 | err); | 1848 | err); |
1850 | goto out; | 1849 | goto out; |
1851 | } else if netif_msg_probe(mac) | 1850 | } else if netif_msg_probe(mac) |
1852 | printk(KERN_INFO "%s: PA Semi %s: intf %d, hw addr %s\n", | 1851 | printk(KERN_INFO "%s: PA Semi %s: intf %d, hw addr %pM\n", |
1853 | dev->name, mac->type == MAC_TYPE_GMAC ? "GMAC" : "XAUI", | 1852 | dev->name, mac->type == MAC_TYPE_GMAC ? "GMAC" : "XAUI", |
1854 | mac->dma_if, print_mac(mac_buf, dev->dev_addr)); | 1853 | mac->dma_if, dev->dev_addr); |
1855 | 1854 | ||
1856 | return err; | 1855 | return err; |
1857 | 1856 | ||