diff options
author | Joe Perches <joe@perches.com> | 2007-10-03 20:59:30 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:51:42 -0400 |
commit | 0795af5729b18218767fab27c44b1384f72dc9ad (patch) | |
tree | 67c16df84aa6ec219340b8ea1b5cfb0e8150a216 /drivers/net/cassini.c | |
parent | 95ea36275f3c9a1d3d04c217b4b576c657c4e70e (diff) |
[NET]: Introduce and use print_mac() and DECLARE_MAC_BUF()
This is nicer than the MAC_FMT stuff.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/cassini.c')
-rw-r--r-- | drivers/net/cassini.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/net/cassini.c b/drivers/net/cassini.c index f44f3d2a4b4e..adc2e4d5a69e 100644 --- a/drivers/net/cassini.c +++ b/drivers/net/cassini.c | |||
@@ -4877,6 +4877,7 @@ static int __devinit cas_init_one(struct pci_dev *pdev, | |||
4877 | int i, err, pci_using_dac; | 4877 | int i, err, pci_using_dac; |
4878 | u16 pci_cmd; | 4878 | u16 pci_cmd; |
4879 | u8 orig_cacheline_size = 0, cas_cacheline_size = 0; | 4879 | u8 orig_cacheline_size = 0, cas_cacheline_size = 0; |
4880 | DECLARE_MAC_BUF(mac); | ||
4880 | 4881 | ||
4881 | if (cas_version_printed++ == 0) | 4882 | if (cas_version_printed++ == 0) |
4882 | printk(KERN_INFO "%s", version); | 4883 | printk(KERN_INFO "%s", version); |
@@ -5084,16 +5085,12 @@ static int __devinit cas_init_one(struct pci_dev *pdev, | |||
5084 | 5085 | ||
5085 | i = readl(cp->regs + REG_BIM_CFG); | 5086 | i = readl(cp->regs + REG_BIM_CFG); |
5086 | printk(KERN_INFO "%s: Sun Cassini%s (%sbit/%sMHz PCI/%s) " | 5087 | printk(KERN_INFO "%s: Sun Cassini%s (%sbit/%sMHz PCI/%s) " |
5087 | "Ethernet[%d] ", dev->name, | 5088 | "Ethernet[%d] %s\n", dev->name, |
5088 | (cp->cas_flags & CAS_FLAG_REG_PLUS) ? "+" : "", | 5089 | (cp->cas_flags & CAS_FLAG_REG_PLUS) ? "+" : "", |
5089 | (i & BIM_CFG_32BIT) ? "32" : "64", | 5090 | (i & BIM_CFG_32BIT) ? "32" : "64", |
5090 | (i & BIM_CFG_66MHZ) ? "66" : "33", | 5091 | (i & BIM_CFG_66MHZ) ? "66" : "33", |
5091 | (cp->phy_type == CAS_PHY_SERDES) ? "Fi" : "Cu", pdev->irq); | 5092 | (cp->phy_type == CAS_PHY_SERDES) ? "Fi" : "Cu", pdev->irq, |
5092 | 5093 | print_mac(mac, dev->dev_addr)); | |
5093 | for (i = 0; i < 6; i++) | ||
5094 | printk("%2.2x%c", dev->dev_addr[i], | ||
5095 | i == 5 ? ' ' : ':'); | ||
5096 | printk("\n"); | ||
5097 | 5094 | ||
5098 | pci_set_drvdata(pdev, dev); | 5095 | pci_set_drvdata(pdev, dev); |
5099 | cp->hw_running = 1; | 5096 | cp->hw_running = 1; |