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/mvme147.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/mvme147.c')
-rw-r--r-- | drivers/net/mvme147.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/mvme147.c b/drivers/net/mvme147.c index 06ca4252155f..d30b0d0026ec 100644 --- a/drivers/net/mvme147.c +++ b/drivers/net/mvme147.c | |||
@@ -67,7 +67,6 @@ struct net_device * __init mvme147lance_probe(int unit) | |||
67 | u_long *addr; | 67 | u_long *addr; |
68 | u_long address; | 68 | u_long address; |
69 | int err; | 69 | int err; |
70 | DECLARE_MAC_BUF(mac); | ||
71 | 70 | ||
72 | if (!MACH_IS_MVME147 || called) | 71 | if (!MACH_IS_MVME147 || called) |
73 | return ERR_PTR(-ENODEV); | 72 | return ERR_PTR(-ENODEV); |
@@ -102,9 +101,9 @@ struct net_device * __init mvme147lance_probe(int unit) | |||
102 | dev->dev_addr[3]=address&0xff; | 101 | dev->dev_addr[3]=address&0xff; |
103 | 102 | ||
104 | printk("%s: MVME147 at 0x%08lx, irq %d, " | 103 | printk("%s: MVME147 at 0x%08lx, irq %d, " |
105 | "Hardware Address %s\n", | 104 | "Hardware Address %pM\n", |
106 | dev->name, dev->base_addr, MVME147_LANCE_IRQ, | 105 | dev->name, dev->base_addr, MVME147_LANCE_IRQ, |
107 | print_mac(mac, dev->dev_addr)); | 106 | dev->dev_addr); |
108 | 107 | ||
109 | lp = (struct m147lance_private *)dev->priv; | 108 | lp = (struct m147lance_private *)dev->priv; |
110 | lp->ram = __get_dma_pages(GFP_ATOMIC, 3); /* 16K */ | 109 | lp->ram = __get_dma_pages(GFP_ATOMIC, 3); /* 16K */ |