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/zorro8390.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/zorro8390.c')
-rw-r--r-- | drivers/net/zorro8390.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/zorro8390.c b/drivers/net/zorro8390.c index 3926b2aa9cca..9c73df4a0d30 100644 --- a/drivers/net/zorro8390.c +++ b/drivers/net/zorro8390.c | |||
@@ -151,7 +151,6 @@ static int __devinit zorro8390_init(struct net_device *dev, | |||
151 | 0x00, 0x02, 0x04, 0x06, 0x08, 0x0a, 0x0c, 0x0e, | 151 | 0x00, 0x02, 0x04, 0x06, 0x08, 0x0a, 0x0c, 0x0e, |
152 | 0x10, 0x12, 0x14, 0x16, 0x18, 0x1a, 0x1c, 0x1e, | 152 | 0x10, 0x12, 0x14, 0x16, 0x18, 0x1a, 0x1c, 0x1e, |
153 | }; | 153 | }; |
154 | DECLARE_MAC_BUF(mac); | ||
155 | 154 | ||
156 | /* Reset card. Who knows what dain-bramaged state it was left in. */ | 155 | /* Reset card. Who knows what dain-bramaged state it was left in. */ |
157 | { | 156 | { |
@@ -216,7 +215,7 @@ static int __devinit zorro8390_init(struct net_device *dev, | |||
216 | dev->dev_addr[i] = SA_prom[i]; | 215 | dev->dev_addr[i] = SA_prom[i]; |
217 | 216 | ||
218 | #ifdef DEBUG | 217 | #ifdef DEBUG |
219 | printk("%s", print_mac(mac, dev->dev_addr)); | 218 | printk("%pM", dev->dev_addr); |
220 | #endif | 219 | #endif |
221 | 220 | ||
222 | ei_status.name = name; | 221 | ei_status.name = name; |
@@ -244,8 +243,8 @@ static int __devinit zorro8390_init(struct net_device *dev, | |||
244 | return err; | 243 | return err; |
245 | } | 244 | } |
246 | 245 | ||
247 | printk(KERN_INFO "%s: %s at 0x%08lx, Ethernet Address %s\n", | 246 | printk(KERN_INFO "%s: %s at 0x%08lx, Ethernet Address %pM\n", |
248 | dev->name, name, board, print_mac(mac, dev->dev_addr)); | 247 | dev->name, name, board, dev->dev_addr); |
249 | 248 | ||
250 | return 0; | 249 | return 0; |
251 | } | 250 | } |