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/amd8111e.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/amd8111e.c')
-rw-r--r-- | drivers/net/amd8111e.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/amd8111e.c b/drivers/net/amd8111e.c index c54967f7942a..20fcf0cdd801 100644 --- a/drivers/net/amd8111e.c +++ b/drivers/net/amd8111e.c | |||
@@ -1820,7 +1820,6 @@ static int __devinit amd8111e_probe_one(struct pci_dev *pdev, | |||
1820 | unsigned long reg_addr,reg_len; | 1820 | unsigned long reg_addr,reg_len; |
1821 | struct amd8111e_priv* lp; | 1821 | struct amd8111e_priv* lp; |
1822 | struct net_device* dev; | 1822 | struct net_device* dev; |
1823 | DECLARE_MAC_BUF(mac); | ||
1824 | 1823 | ||
1825 | err = pci_enable_device(pdev); | 1824 | err = pci_enable_device(pdev); |
1826 | if(err){ | 1825 | if(err){ |
@@ -1962,8 +1961,8 @@ static int __devinit amd8111e_probe_one(struct pci_dev *pdev, | |||
1962 | chip_version = (readl(lp->mmio + CHIPID) & 0xf0000000)>>28; | 1961 | chip_version = (readl(lp->mmio + CHIPID) & 0xf0000000)>>28; |
1963 | printk(KERN_INFO "%s: AMD-8111e Driver Version: %s\n", | 1962 | printk(KERN_INFO "%s: AMD-8111e Driver Version: %s\n", |
1964 | dev->name,MODULE_VERS); | 1963 | dev->name,MODULE_VERS); |
1965 | printk(KERN_INFO "%s: [ Rev %x ] PCI 10/100BaseT Ethernet %s\n", | 1964 | printk(KERN_INFO "%s: [ Rev %x ] PCI 10/100BaseT Ethernet %pM\n", |
1966 | dev->name, chip_version, print_mac(mac, dev->dev_addr)); | 1965 | dev->name, chip_version, dev->dev_addr); |
1967 | if (lp->ext_phy_id) | 1966 | if (lp->ext_phy_id) |
1968 | printk(KERN_INFO "%s: Found MII PHY ID 0x%08x at address 0x%02x\n", | 1967 | printk(KERN_INFO "%s: Found MII PHY ID 0x%08x at address 0x%02x\n", |
1969 | dev->name, lp->ext_phy_id, lp->ext_phy_addr); | 1968 | dev->name, lp->ext_phy_id, lp->ext_phy_addr); |