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/eepro100.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/eepro100.c')
-rw-r--r-- | drivers/net/eepro100.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/eepro100.c b/drivers/net/eepro100.c index e3e26c595fa3..81e84843c6a0 100644 --- a/drivers/net/eepro100.c +++ b/drivers/net/eepro100.c | |||
@@ -616,7 +616,6 @@ static int __devinit speedo_found1(struct pci_dev *pdev, | |||
616 | int size; | 616 | int size; |
617 | void *tx_ring_space; | 617 | void *tx_ring_space; |
618 | dma_addr_t tx_ring_dma; | 618 | dma_addr_t tx_ring_dma; |
619 | DECLARE_MAC_BUF(mac); | ||
620 | 619 | ||
621 | size = TX_RING_SIZE * sizeof(struct TxFD) + sizeof(struct speedo_stats); | 620 | size = TX_RING_SIZE * sizeof(struct TxFD) + sizeof(struct speedo_stats); |
622 | tx_ring_space = pci_alloc_consistent(pdev, size, &tx_ring_dma); | 621 | tx_ring_space = pci_alloc_consistent(pdev, size, &tx_ring_dma); |
@@ -700,8 +699,8 @@ static int __devinit speedo_found1(struct pci_dev *pdev, | |||
700 | else | 699 | else |
701 | product = pci_name(pdev); | 700 | product = pci_name(pdev); |
702 | 701 | ||
703 | printk(KERN_INFO "%s: %s, %s, IRQ %d.\n", dev->name, product, | 702 | printk(KERN_INFO "%s: %s, %pM, IRQ %d.\n", dev->name, product, |
704 | print_mac(mac, dev->dev_addr), pdev->irq); | 703 | dev->dev_addr, pdev->irq); |
705 | 704 | ||
706 | sp = netdev_priv(dev); | 705 | sp = netdev_priv(dev); |
707 | 706 | ||