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/8139too.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/8139too.c')
-rw-r--r-- | drivers/net/8139too.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c index 63f906b04899..96841e40bd46 100644 --- a/drivers/net/8139too.c +++ b/drivers/net/8139too.c | |||
@@ -925,7 +925,6 @@ static int __devinit rtl8139_init_one (struct pci_dev *pdev, | |||
925 | int i, addr_len, option; | 925 | int i, addr_len, option; |
926 | void __iomem *ioaddr; | 926 | void __iomem *ioaddr; |
927 | static int board_idx = -1; | 927 | static int board_idx = -1; |
928 | DECLARE_MAC_BUF(mac); | ||
929 | 928 | ||
930 | assert (pdev != NULL); | 929 | assert (pdev != NULL); |
931 | assert (ent != NULL); | 930 | assert (ent != NULL); |
@@ -1024,11 +1023,11 @@ static int __devinit rtl8139_init_one (struct pci_dev *pdev, | |||
1024 | pci_set_drvdata (pdev, dev); | 1023 | pci_set_drvdata (pdev, dev); |
1025 | 1024 | ||
1026 | printk (KERN_INFO "%s: %s at 0x%lx, " | 1025 | printk (KERN_INFO "%s: %s at 0x%lx, " |
1027 | "%s, IRQ %d\n", | 1026 | "%pM, IRQ %d\n", |
1028 | dev->name, | 1027 | dev->name, |
1029 | board_info[ent->driver_data].name, | 1028 | board_info[ent->driver_data].name, |
1030 | dev->base_addr, | 1029 | dev->base_addr, |
1031 | print_mac(mac, dev->dev_addr), | 1030 | dev->dev_addr, |
1032 | dev->irq); | 1031 | dev->irq); |
1033 | 1032 | ||
1034 | printk (KERN_DEBUG "%s: Identified 8139 chip type '%s'\n", | 1033 | printk (KERN_DEBUG "%s: Identified 8139 chip type '%s'\n", |