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/sungem.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/sungem.c')
-rw-r--r-- | drivers/net/sungem.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c index 4291458955ef..250f08687b71 100644 --- a/drivers/net/sungem.c +++ b/drivers/net/sungem.c | |||
@@ -2966,7 +2966,6 @@ static int __devinit gem_init_one(struct pci_dev *pdev, | |||
2966 | struct net_device *dev; | 2966 | struct net_device *dev; |
2967 | struct gem *gp; | 2967 | struct gem *gp; |
2968 | int err, pci_using_dac; | 2968 | int err, pci_using_dac; |
2969 | DECLARE_MAC_BUF(mac); | ||
2970 | 2969 | ||
2971 | if (gem_version_printed++ == 0) | 2970 | if (gem_version_printed++ == 0) |
2972 | printk(KERN_INFO "%s", version); | 2971 | printk(KERN_INFO "%s", version); |
@@ -3150,9 +3149,8 @@ static int __devinit gem_init_one(struct pci_dev *pdev, | |||
3150 | goto err_out_free_consistent; | 3149 | goto err_out_free_consistent; |
3151 | } | 3150 | } |
3152 | 3151 | ||
3153 | printk(KERN_INFO "%s: Sun GEM (PCI) 10/100/1000BaseT Ethernet " | 3152 | printk(KERN_INFO "%s: Sun GEM (PCI) 10/100/1000BaseT Ethernet %pM\n", |
3154 | "%s\n", | 3153 | dev->name, dev->dev_addr); |
3155 | dev->name, print_mac(mac, dev->dev_addr)); | ||
3156 | 3154 | ||
3157 | if (gp->phy_type == phy_mii_mdio0 || | 3155 | if (gp->phy_type == phy_mii_mdio0 || |
3158 | gp->phy_type == phy_mii_mdio1) | 3156 | gp->phy_type == phy_mii_mdio1) |