aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/8139cp.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2008-10-27 18:59:26 -0400
committerDavid S. Miller <davem@davemloft.net>2008-10-27 20:06:18 -0400
commite174961ca1a0b28f7abf0be47973ad57cb74e5f0 (patch)
treee8f74ecd420a0e380a71670e5aec5c2a0c15640a /drivers/net/8139cp.c
parent0c68ae2605dbcf67414d8d1f19af93be44b355fb (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/8139cp.c')
-rw-r--r--drivers/net/8139cp.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c
index 9ba1f0b46429..9e90d411e0ad 100644
--- a/drivers/net/8139cp.c
+++ b/drivers/net/8139cp.c
@@ -1826,7 +1826,6 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
1826 void __iomem *regs; 1826 void __iomem *regs;
1827 resource_size_t pciaddr; 1827 resource_size_t pciaddr;
1828 unsigned int addr_len, i, pci_using_dac; 1828 unsigned int addr_len, i, pci_using_dac;
1829 DECLARE_MAC_BUF(mac);
1830 1829
1831#ifndef MODULE 1830#ifndef MODULE
1832 static int version_printed; 1831 static int version_printed;
@@ -1967,10 +1966,10 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
1967 goto err_out_iomap; 1966 goto err_out_iomap;
1968 1967
1969 printk (KERN_INFO "%s: RTL-8139C+ at 0x%lx, " 1968 printk (KERN_INFO "%s: RTL-8139C+ at 0x%lx, "
1970 "%s, IRQ %d\n", 1969 "%pM, IRQ %d\n",
1971 dev->name, 1970 dev->name,
1972 dev->base_addr, 1971 dev->base_addr,
1973 print_mac(mac, dev->dev_addr), 1972 dev->dev_addr,
1974 dev->irq); 1973 dev->irq);
1975 1974
1976 pci_set_drvdata(pdev, dev); 1975 pci_set_drvdata(pdev, dev);