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