aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/at1700.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2007-10-03 20:59:30 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 19:51:42 -0400
commit0795af5729b18218767fab27c44b1384f72dc9ad (patch)
tree67c16df84aa6ec219340b8ea1b5cfb0e8150a216 /drivers/net/at1700.c
parent95ea36275f3c9a1d3d04c217b4b576c657c4e70e (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/at1700.c')
-rw-r--r--drivers/net/at1700.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/at1700.c b/drivers/net/at1700.c
index a124fdb2bce6..b032c1bf492f 100644
--- a/drivers/net/at1700.c
+++ b/drivers/net/at1700.c
@@ -265,6 +265,7 @@ static int __init at1700_probe1(struct net_device *dev, int ioaddr)
265 unsigned int i, irq, is_fmv18x = 0, is_at1700 = 0; 265 unsigned int i, irq, is_fmv18x = 0, is_at1700 = 0;
266 int slot, ret = -ENODEV; 266 int slot, ret = -ENODEV;
267 struct net_local *lp = netdev_priv(dev); 267 struct net_local *lp = netdev_priv(dev);
268 DECLARE_MAC_BUF(mac);
268 269
269 if (!request_region(ioaddr, AT1700_IO_EXTENT, DRV_NAME)) 270 if (!request_region(ioaddr, AT1700_IO_EXTENT, DRV_NAME))
270 return -EBUSY; 271 return -EBUSY;
@@ -388,16 +389,15 @@ found:
388 if (is_at1700) { 389 if (is_at1700) {
389 for(i = 0; i < 3; i++) { 390 for(i = 0; i < 3; i++) {
390 unsigned short eeprom_val = read_eeprom(ioaddr, 4+i); 391 unsigned short eeprom_val = read_eeprom(ioaddr, 4+i);
391 printk("%04x", eeprom_val);
392 ((unsigned short *)dev->dev_addr)[i] = ntohs(eeprom_val); 392 ((unsigned short *)dev->dev_addr)[i] = ntohs(eeprom_val);
393 } 393 }
394 } else { 394 } else {
395 for(i = 0; i < 6; i++) { 395 for(i = 0; i < 6; i++) {
396 unsigned char val = inb(ioaddr + SAPROM + i); 396 unsigned char val = inb(ioaddr + SAPROM + i);
397 printk("%02x", val);
398 dev->dev_addr[i] = val; 397 dev->dev_addr[i] = val;
399 } 398 }
400 } 399 }
400 printk("%s", print_mac(mac, dev->dev_addr));
401 401
402 /* The EEPROM word 12 bit 0x0400 means use regular 100 ohm 10baseT signals, 402 /* The EEPROM word 12 bit 0x0400 means use regular 100 ohm 10baseT signals,
403 rather than 150 ohm shielded twisted pair compensation. 403 rather than 150 ohm shielded twisted pair compensation.