aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/znet.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/znet.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/znet.c')
-rw-r--r--drivers/net/znet.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/net/znet.c b/drivers/net/znet.c
index 43712c7b9ecf..a86c022d6a94 100644
--- a/drivers/net/znet.c
+++ b/drivers/net/znet.c
@@ -370,6 +370,7 @@ static int __init znet_probe (void)
370 struct net_device *dev; 370 struct net_device *dev;
371 char *p; 371 char *p;
372 int err = -ENOMEM; 372 int err = -ENOMEM;
373 DECLARE_MAC_BUF(mac);
373 374
374 /* This code scans the region 0xf0000 to 0xfffff for a "NETIDBLK". */ 375 /* This code scans the region 0xf0000 to 0xfffff for a "NETIDBLK". */
375 for(p = (char *)phys_to_virt(0xf0000); p < (char *)phys_to_virt(0x100000); p++) 376 for(p = (char *)phys_to_virt(0xf0000); p < (char *)phys_to_virt(0x100000); p++)
@@ -392,14 +393,14 @@ static int __init znet_probe (void)
392 dev->base_addr = netinfo->iobase1; 393 dev->base_addr = netinfo->iobase1;
393 dev->irq = netinfo->irq1; 394 dev->irq = netinfo->irq1;
394 395
395 printk(KERN_INFO "%s: ZNET at %#3lx,", dev->name, dev->base_addr);
396
397 /* The station address is in the "netidblk" at 0x0f0000. */ 396 /* The station address is in the "netidblk" at 0x0f0000. */
398 for (i = 0; i < 6; i++) 397 for (i = 0; i < 6; i++)
399 printk(" %2.2x", dev->dev_addr[i] = netinfo->netid[i]); 398 dev->dev_addr[i] = netinfo->netid[i];
400 399
401 printk(", using IRQ %d DMA %d and %d.\n", dev->irq, netinfo->dma1, 400 printk(KERN_INFO "%s: ZNET at %#3lx, %s"
402 netinfo->dma2); 401 ", using IRQ %d DMA %d and %d.\n",
402 dev->name, dev->base_addr, print_mac(mac, dev->dev_addr),
403 dev->irq, netinfo->dma1, netinfo->dma2);
403 404
404 if (znet_debug > 1) { 405 if (znet_debug > 1) {
405 printk(KERN_INFO "%s: vendor '%16.16s' IRQ1 %d IRQ2 %d DMA1 %d DMA2 %d.\n", 406 printk(KERN_INFO "%s: vendor '%16.16s' IRQ1 %d IRQ2 %d DMA1 %d DMA2 %d.\n",