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/ne3210.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/ne3210.c')
-rw-r--r-- | drivers/net/ne3210.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/ne3210.c b/drivers/net/ne3210.c index 425043a88db9..6681ca748c74 100644 --- a/drivers/net/ne3210.c +++ b/drivers/net/ne3210.c | |||
@@ -99,7 +99,6 @@ static int __init ne3210_eisa_probe (struct device *device) | |||
99 | int i, retval, port_index; | 99 | int i, retval, port_index; |
100 | struct eisa_device *edev = to_eisa_device (device); | 100 | struct eisa_device *edev = to_eisa_device (device); |
101 | struct net_device *dev; | 101 | struct net_device *dev; |
102 | DECLARE_MAC_BUF(mac); | ||
103 | 102 | ||
104 | /* Allocate dev->priv and fill in 8390 specific dev fields. */ | 103 | /* Allocate dev->priv and fill in 8390 specific dev fields. */ |
105 | if (!(dev = alloc_ei_netdev ())) { | 104 | if (!(dev = alloc_ei_netdev ())) { |
@@ -131,8 +130,8 @@ static int __init ne3210_eisa_probe (struct device *device) | |||
131 | port_index = inb(ioaddr + NE3210_CFG2) >> 6; | 130 | port_index = inb(ioaddr + NE3210_CFG2) >> 6; |
132 | for(i = 0; i < ETHER_ADDR_LEN; i++) | 131 | for(i = 0; i < ETHER_ADDR_LEN; i++) |
133 | dev->dev_addr[i] = inb(ioaddr + NE3210_SA_PROM + i); | 132 | dev->dev_addr[i] = inb(ioaddr + NE3210_SA_PROM + i); |
134 | printk("ne3210.c: NE3210 in EISA slot %d, media: %s, addr: %s.\n", | 133 | printk("ne3210.c: NE3210 in EISA slot %d, media: %s, addr: %pM.\n", |
135 | edev->slot, ifmap[port_index], print_mac(mac, dev->dev_addr)); | 134 | edev->slot, ifmap[port_index], dev->dev_addr); |
136 | 135 | ||
137 | /* Snarf the interrupt now. CFG file has them all listed as `edge' with share=NO */ | 136 | /* Snarf the interrupt now. CFG file has them all listed as `edge' with share=NO */ |
138 | dev->irq = irq_map[(inb(ioaddr + NE3210_CFG2) >> 3) & 0x07]; | 137 | dev->irq = irq_map[(inb(ioaddr + NE3210_CFG2) >> 3) & 0x07]; |