aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ne3210.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/ne3210.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/ne3210.c')
-rw-r--r--drivers/net/ne3210.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/net/ne3210.c b/drivers/net/ne3210.c
index b1bf8331e872..425043a88db9 100644
--- a/drivers/net/ne3210.c
+++ b/drivers/net/ne3210.c
@@ -99,6 +99,7 @@ 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);
102 103
103 /* Allocate dev->priv and fill in 8390 specific dev fields. */ 104 /* Allocate dev->priv and fill in 8390 specific dev fields. */
104 if (!(dev = alloc_ei_netdev ())) { 105 if (!(dev = alloc_ei_netdev ())) {
@@ -127,17 +128,15 @@ static int __init ne3210_eisa_probe (struct device *device)
127 inb(ioaddr + NE3210_CFG1), inb(ioaddr + NE3210_CFG2)); 128 inb(ioaddr + NE3210_CFG1), inb(ioaddr + NE3210_CFG2));
128#endif 129#endif
129 130
130
131 port_index = inb(ioaddr + NE3210_CFG2) >> 6; 131 port_index = inb(ioaddr + NE3210_CFG2) >> 6;
132 printk("ne3210.c: NE3210 in EISA slot %d, media: %s, addr:",
133 edev->slot, ifmap[port_index]);
134 for(i = 0; i < ETHER_ADDR_LEN; i++) 132 for(i = 0; i < ETHER_ADDR_LEN; i++)
135 printk(" %02x", (dev->dev_addr[i] = inb(ioaddr + NE3210_SA_PROM + i))); 133 dev->dev_addr[i] = inb(ioaddr + NE3210_SA_PROM + i);
136 134 printk("ne3210.c: NE3210 in EISA slot %d, media: %s, addr: %s.\n",
135 edev->slot, ifmap[port_index], print_mac(mac, dev->dev_addr));
137 136
138 /* Snarf the interrupt now. CFG file has them all listed as `edge' with share=NO */ 137 /* Snarf the interrupt now. CFG file has them all listed as `edge' with share=NO */
139 dev->irq = irq_map[(inb(ioaddr + NE3210_CFG2) >> 3) & 0x07]; 138 dev->irq = irq_map[(inb(ioaddr + NE3210_CFG2) >> 3) & 0x07];
140 printk(".\nne3210.c: using IRQ %d, ", dev->irq); 139 printk("ne3210.c: using IRQ %d, ", dev->irq);
141 140
142 retval = request_irq(dev->irq, ei_interrupt, 0, DRV_NAME, dev); 141 retval = request_irq(dev->irq, ei_interrupt, 0, DRV_NAME, dev);
143 if (retval) { 142 if (retval) {