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/cassini.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/cassini.c')
-rw-r--r-- | drivers/net/cassini.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/cassini.c b/drivers/net/cassini.c index 86909cfb14de..a06931d76f94 100644 --- a/drivers/net/cassini.c +++ b/drivers/net/cassini.c | |||
@@ -4988,7 +4988,6 @@ static int __devinit cas_init_one(struct pci_dev *pdev, | |||
4988 | int i, err, pci_using_dac; | 4988 | int i, err, pci_using_dac; |
4989 | u16 pci_cmd; | 4989 | u16 pci_cmd; |
4990 | u8 orig_cacheline_size = 0, cas_cacheline_size = 0; | 4990 | u8 orig_cacheline_size = 0, cas_cacheline_size = 0; |
4991 | DECLARE_MAC_BUF(mac); | ||
4992 | 4991 | ||
4993 | if (cas_version_printed++ == 0) | 4992 | if (cas_version_printed++ == 0) |
4994 | printk(KERN_INFO "%s", version); | 4993 | printk(KERN_INFO "%s", version); |
@@ -5201,12 +5200,12 @@ static int __devinit cas_init_one(struct pci_dev *pdev, | |||
5201 | 5200 | ||
5202 | i = readl(cp->regs + REG_BIM_CFG); | 5201 | i = readl(cp->regs + REG_BIM_CFG); |
5203 | printk(KERN_INFO "%s: Sun Cassini%s (%sbit/%sMHz PCI/%s) " | 5202 | printk(KERN_INFO "%s: Sun Cassini%s (%sbit/%sMHz PCI/%s) " |
5204 | "Ethernet[%d] %s\n", dev->name, | 5203 | "Ethernet[%d] %pM\n", dev->name, |
5205 | (cp->cas_flags & CAS_FLAG_REG_PLUS) ? "+" : "", | 5204 | (cp->cas_flags & CAS_FLAG_REG_PLUS) ? "+" : "", |
5206 | (i & BIM_CFG_32BIT) ? "32" : "64", | 5205 | (i & BIM_CFG_32BIT) ? "32" : "64", |
5207 | (i & BIM_CFG_66MHZ) ? "66" : "33", | 5206 | (i & BIM_CFG_66MHZ) ? "66" : "33", |
5208 | (cp->phy_type == CAS_PHY_SERDES) ? "Fi" : "Cu", pdev->irq, | 5207 | (cp->phy_type == CAS_PHY_SERDES) ? "Fi" : "Cu", pdev->irq, |
5209 | print_mac(mac, dev->dev_addr)); | 5208 | dev->dev_addr); |
5210 | 5209 | ||
5211 | pci_set_drvdata(pdev, dev); | 5210 | pci_set_drvdata(pdev, dev); |
5212 | cp->hw_running = 1; | 5211 | cp->hw_running = 1; |