aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/hamachi.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/hamachi.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/hamachi.c')
-rw-r--r--drivers/net/hamachi.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/hamachi.c b/drivers/net/hamachi.c
index da12b3db023f..015ed3a4057f 100644
--- a/drivers/net/hamachi.c
+++ b/drivers/net/hamachi.c
@@ -580,6 +580,7 @@ static int __devinit hamachi_init_one (struct pci_dev *pdev,
580 void *ring_space; 580 void *ring_space;
581 dma_addr_t ring_dma; 581 dma_addr_t ring_dma;
582 int ret = -ENOMEM; 582 int ret = -ENOMEM;
583 DECLARE_MAC_BUF(mac);
583 584
584/* when built into the kernel, we only print version if device is found */ 585/* when built into the kernel, we only print version if device is found */
585#ifndef MODULE 586#ifndef MODULE
@@ -741,12 +742,9 @@ static int __devinit hamachi_init_one (struct pci_dev *pdev,
741 goto err_out_unmap_rx; 742 goto err_out_unmap_rx;
742 } 743 }
743 744
744 printk(KERN_INFO "%s: %s type %x at %p, ", 745 printk(KERN_INFO "%s: %s type %x at %p, %s, IRQ %d.\n",
745 dev->name, chip_tbl[chip_id].name, readl(ioaddr + ChipRev), 746 dev->name, chip_tbl[chip_id].name, readl(ioaddr + ChipRev),
746 ioaddr); 747 ioaddr, print_mac(mac, dev->dev_addr), irq);
747 for (i = 0; i < 5; i++)
748 printk("%2.2x:", dev->dev_addr[i]);
749 printk("%2.2x, IRQ %d.\n", dev->dev_addr[i], irq);
750 i = readb(ioaddr + PCIClkMeas); 748 i = readb(ioaddr + PCIClkMeas);
751 printk(KERN_INFO "%s: %d-bit %d Mhz PCI bus (%d), Virtual Jumpers " 749 printk(KERN_INFO "%s: %d-bit %d Mhz PCI bus (%d), Virtual Jumpers "
752 "%2.2x, LPA %4.4x.\n", 750 "%2.2x, LPA %4.4x.\n",