aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/sis900.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/sis900.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/sis900.c')
-rw-r--r--drivers/net/sis900.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c
index 5da8e671324d..0857d2c88aa0 100644
--- a/drivers/net/sis900.c
+++ b/drivers/net/sis900.c
@@ -404,6 +404,7 @@ static int __devinit sis900_probe(struct pci_dev *pci_dev,
404 int i, ret; 404 int i, ret;
405 const char *card_name = card_names[pci_id->driver_data]; 405 const char *card_name = card_names[pci_id->driver_data];
406 const char *dev_name = pci_name(pci_dev); 406 const char *dev_name = pci_name(pci_dev);
407 DECLARE_MAC_BUF(mac);
407 408
408/* when built into the kernel, we only print version if device is found */ 409/* when built into the kernel, we only print version if device is found */
409#ifndef MODULE 410#ifndef MODULE
@@ -533,11 +534,9 @@ static int __devinit sis900_probe(struct pci_dev *pci_dev,
533 goto err_unmap_rx; 534 goto err_unmap_rx;
534 535
535 /* print some information about our NIC */ 536 /* print some information about our NIC */
536 printk(KERN_INFO "%s: %s at %#lx, IRQ %d, ", net_dev->name, 537 printk(KERN_INFO "%s: %s at %#lx, IRQ %d, %s\n",
537 card_name, ioaddr, net_dev->irq); 538 net_dev->name, card_name, ioaddr, net_dev->irq,
538 for (i = 0; i < 5; i++) 539 print_mac(mac, net_dev->dev_addr));
539 printk("%2.2x:", (u8)net_dev->dev_addr[i]);
540 printk("%2.2x.\n", net_dev->dev_addr[i]);
541 540
542 /* Detect Wake on Lan support */ 541 /* Detect Wake on Lan support */
543 ret = (inl(net_dev->base_addr + CFGPMC) & PMESP) >> 27; 542 ret = (inl(net_dev->base_addr + CFGPMC) & PMESP) >> 27;