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/dl2k.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/dl2k.c')
-rw-r--r-- | drivers/net/dl2k.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/dl2k.c b/drivers/net/dl2k.c index f8037110a522..f9e405a8a844 100644 --- a/drivers/net/dl2k.c +++ b/drivers/net/dl2k.c | |||
@@ -97,7 +97,6 @@ rio_probe1 (struct pci_dev *pdev, const struct pci_device_id *ent) | |||
97 | static int version_printed; | 97 | static int version_printed; |
98 | void *ring_space; | 98 | void *ring_space; |
99 | dma_addr_t ring_dma; | 99 | dma_addr_t ring_dma; |
100 | DECLARE_MAC_BUF(mac); | ||
101 | 100 | ||
102 | if (!version_printed++) | 101 | if (!version_printed++) |
103 | printk ("%s", version); | 102 | printk ("%s", version); |
@@ -257,8 +256,8 @@ rio_probe1 (struct pci_dev *pdev, const struct pci_device_id *ent) | |||
257 | 256 | ||
258 | card_idx++; | 257 | card_idx++; |
259 | 258 | ||
260 | printk (KERN_INFO "%s: %s, %s, IRQ %d\n", | 259 | printk (KERN_INFO "%s: %s, %pM, IRQ %d\n", |
261 | dev->name, np->name, print_mac(mac, dev->dev_addr), irq); | 260 | dev->name, np->name, dev->dev_addr, irq); |
262 | if (tx_coalesce > 1) | 261 | if (tx_coalesce > 1) |
263 | printk(KERN_INFO "tx_coalesce:\t%d packets\n", | 262 | printk(KERN_INFO "tx_coalesce:\t%d packets\n", |
264 | tx_coalesce); | 263 | tx_coalesce); |