aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/3c509.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/3c509.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/3c509.c')
-rw-r--r--drivers/net/3c509.c18
1 files changed, 6 insertions, 12 deletions
diff --git a/drivers/net/3c509.c b/drivers/net/3c509.c
index 7466987d8451..c576fe76d54f 100644
--- a/drivers/net/3c509.c
+++ b/drivers/net/3c509.c
@@ -313,8 +313,9 @@ static int nopnp;
313static int __init el3_common_init(struct net_device *dev) 313static int __init el3_common_init(struct net_device *dev)
314{ 314{
315 struct el3_private *lp = netdev_priv(dev); 315 struct el3_private *lp = netdev_priv(dev);
316 short i;
317 int err; 316 int err;
317 DECLARE_MAC_BUF(mac);
318 const char *if_names[] = {"10baseT", "AUI", "undefined", "BNC"};
318 319
319 spin_lock_init(&lp->lock); 320 spin_lock_init(&lp->lock);
320 321
@@ -346,17 +347,10 @@ static int __init el3_common_init(struct net_device *dev)
346 return err; 347 return err;
347 } 348 }
348 349
349 { 350 printk(KERN_INFO "%s: 3c5x9 found at %#3.3lx, %s port, "
350 const char *if_names[] = {"10baseT", "AUI", "undefined", "BNC"}; 351 "address %s, IRQ %d.\n",
351 printk("%s: 3c5x9 found at %#3.3lx, %s port, address ", 352 dev->name, dev->base_addr, if_names[(dev->if_port & 0x03)],
352 dev->name, dev->base_addr, 353 print_mac(mac, dev->dev_addr), dev->irq);
353 if_names[(dev->if_port & 0x03)]);
354 }
355
356 /* Read in the station address. */
357 for (i = 0; i < 6; i++)
358 printk(" %2.2x", dev->dev_addr[i]);
359 printk(", IRQ %d.\n", dev->irq);
360 354
361 if (el3_debug > 0) 355 if (el3_debug > 0)
362 printk(KERN_INFO "%s", version); 356 printk(KERN_INFO "%s", version);