diff options
author | Joe Perches <joe@perches.com> | 2007-10-03 20:59:30 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:51:42 -0400 |
commit | 0795af5729b18218767fab27c44b1384f72dc9ad (patch) | |
tree | 67c16df84aa6ec219340b8ea1b5cfb0e8150a216 /drivers/net/zorro8390.c | |
parent | 95ea36275f3c9a1d3d04c217b4b576c657c4e70e (diff) |
[NET]: Introduce and use print_mac() and DECLARE_MAC_BUF()
This is nicer than the MAC_FMT stuff.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/zorro8390.c')
-rw-r--r-- | drivers/net/zorro8390.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/net/zorro8390.c b/drivers/net/zorro8390.c index fb215eb6dcf3..3926b2aa9cca 100644 --- a/drivers/net/zorro8390.c +++ b/drivers/net/zorro8390.c | |||
@@ -151,6 +151,7 @@ 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); | ||
154 | 155 | ||
155 | /* Reset card. Who knows what dain-bramaged state it was left in. */ | 156 | /* Reset card. Who knows what dain-bramaged state it was left in. */ |
156 | { | 157 | { |
@@ -211,12 +212,12 @@ static int __devinit zorro8390_init(struct net_device *dev, | |||
211 | i = request_irq(IRQ_AMIGA_PORTS, __ei_interrupt, IRQF_SHARED, DRV_NAME, dev); | 212 | i = request_irq(IRQ_AMIGA_PORTS, __ei_interrupt, IRQF_SHARED, DRV_NAME, dev); |
212 | if (i) return i; | 213 | if (i) return i; |
213 | 214 | ||
214 | for(i = 0; i < ETHER_ADDR_LEN; i++) { | 215 | for(i = 0; i < ETHER_ADDR_LEN; i++) |
216 | dev->dev_addr[i] = SA_prom[i]; | ||
217 | |||
215 | #ifdef DEBUG | 218 | #ifdef DEBUG |
216 | printk(" %2.2x", SA_prom[i]); | 219 | printk("%s", print_mac(mac, dev->dev_addr)); |
217 | #endif | 220 | #endif |
218 | dev->dev_addr[i] = SA_prom[i]; | ||
219 | } | ||
220 | 221 | ||
221 | ei_status.name = name; | 222 | ei_status.name = name; |
222 | ei_status.tx_start_page = start_page; | 223 | ei_status.tx_start_page = start_page; |
@@ -243,10 +244,8 @@ static int __devinit zorro8390_init(struct net_device *dev, | |||
243 | return err; | 244 | return err; |
244 | } | 245 | } |
245 | 246 | ||
246 | printk(KERN_INFO "%s: %s at 0x%08lx, Ethernet Address " | 247 | printk(KERN_INFO "%s: %s at 0x%08lx, Ethernet Address %s\n", |
247 | "%02x:%02x:%02x:%02x:%02x:%02x\n", dev->name, name, board, | 248 | dev->name, name, board, print_mac(mac, dev->dev_addr)); |
248 | dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2], | ||
249 | dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]); | ||
250 | 249 | ||
251 | return 0; | 250 | return 0; |
252 | } | 251 | } |