aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/tulip/de2104x.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/tulip/de2104x.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/tulip/de2104x.c')
-rw-r--r--drivers/net/tulip/de2104x.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c
index 124d5d690dde..08076182df7c 100644
--- a/drivers/net/tulip/de2104x.c
+++ b/drivers/net/tulip/de2104x.c
@@ -1932,7 +1932,6 @@ static int __devinit de_init_one (struct pci_dev *pdev,
1932 void __iomem *regs; 1932 void __iomem *regs;
1933 unsigned long pciaddr; 1933 unsigned long pciaddr;
1934 static int board_idx = -1; 1934 static int board_idx = -1;
1935 DECLARE_MAC_BUF(mac);
1936 1935
1937 board_idx++; 1936 board_idx++;
1938 1937
@@ -2046,11 +2045,11 @@ static int __devinit de_init_one (struct pci_dev *pdev,
2046 goto err_out_iomap; 2045 goto err_out_iomap;
2047 2046
2048 /* print info about board and interface just registered */ 2047 /* print info about board and interface just registered */
2049 printk (KERN_INFO "%s: %s at 0x%lx, %s, IRQ %d\n", 2048 printk (KERN_INFO "%s: %s at 0x%lx, %pM, IRQ %d\n",
2050 dev->name, 2049 dev->name,
2051 de->de21040 ? "21040" : "21041", 2050 de->de21040 ? "21040" : "21041",
2052 dev->base_addr, 2051 dev->base_addr,
2053 print_mac(mac, dev->dev_addr), 2052 dev->dev_addr,
2054 dev->irq); 2053 dev->irq);
2055 2054
2056 pci_set_drvdata(pdev, dev); 2055 pci_set_drvdata(pdev, dev);