aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ns83820.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2007-10-03 20:59:30 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 19:51:42 -0400
commit0795af5729b18218767fab27c44b1384f72dc9ad (patch)
tree67c16df84aa6ec219340b8ea1b5cfb0e8150a216 /drivers/net/ns83820.c
parent95ea36275f3c9a1d3d04c217b4b576c657c4e70e (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/ns83820.c')
-rw-r--r--drivers/net/ns83820.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/ns83820.c b/drivers/net/ns83820.c
index de495b697294..ea71f6d82661 100644
--- a/drivers/net/ns83820.c
+++ b/drivers/net/ns83820.c
@@ -1962,6 +1962,7 @@ static int __devinit ns83820_init_one(struct pci_dev *pci_dev, const struct pci_
1962 long addr; 1962 long addr;
1963 int err; 1963 int err;
1964 int using_dac = 0; 1964 int using_dac = 0;
1965 DECLARE_MAC_BUF(mac);
1965 1966
1966 /* See if we can set the dma mask early on; failure is fatal. */ 1967 /* See if we can set the dma mask early on; failure is fatal. */
1967 if (sizeof(dma_addr_t) == 8 && 1968 if (sizeof(dma_addr_t) == 8 &&
@@ -2226,13 +2227,11 @@ static int __devinit ns83820_init_one(struct pci_dev *pci_dev, const struct pci_
2226 ndev->features |= NETIF_F_HIGHDMA; 2227 ndev->features |= NETIF_F_HIGHDMA;
2227 } 2228 }
2228 2229
2229 printk(KERN_INFO "%s: ns83820 v" VERSION ": DP83820 v%u.%u: %02x:%02x:%02x:%02x:%02x:%02x io=0x%08lx irq=%d f=%s\n", 2230 printk(KERN_INFO "%s: ns83820 v" VERSION ": DP83820 v%u.%u: %s io=0x%08lx irq=%d f=%s\n",
2230 ndev->name, 2231 ndev->name,
2231 (unsigned)readl(dev->base + SRR) >> 8, 2232 (unsigned)readl(dev->base + SRR) >> 8,
2232 (unsigned)readl(dev->base + SRR) & 0xff, 2233 (unsigned)readl(dev->base + SRR) & 0xff,
2233 ndev->dev_addr[0], ndev->dev_addr[1], 2234 print_mac(mac, ndev->dev_addr),
2234 ndev->dev_addr[2], ndev->dev_addr[3],
2235 ndev->dev_addr[4], ndev->dev_addr[5],
2236 addr, pci_dev->irq, 2235 addr, pci_dev->irq,
2237 (ndev->features & NETIF_F_HIGHDMA) ? "h,sg" : "sg" 2236 (ndev->features & NETIF_F_HIGHDMA) ? "h,sg" : "sg"
2238 ); 2237 );