aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/typhoon.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/typhoon.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/typhoon.c')
-rw-r--r--drivers/net/typhoon.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c
index c6d8513ecad6..43894e95fcb3 100644
--- a/drivers/net/typhoon.c
+++ b/drivers/net/typhoon.c
@@ -2316,8 +2316,8 @@ typhoon_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
2316 dma_addr_t shared_dma; 2316 dma_addr_t shared_dma;
2317 struct cmd_desc xp_cmd; 2317 struct cmd_desc xp_cmd;
2318 struct resp_desc xp_resp[3]; 2318 struct resp_desc xp_resp[3];
2319 int i;
2320 int err = 0; 2319 int err = 0;
2320 DECLARE_MAC_BUF(mac);
2321 2321
2322 if(!did_version++) 2322 if(!did_version++)
2323 printk(KERN_INFO "%s", version); 2323 printk(KERN_INFO "%s", version);
@@ -2532,13 +2532,11 @@ typhoon_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
2532 2532
2533 pci_set_drvdata(pdev, dev); 2533 pci_set_drvdata(pdev, dev);
2534 2534
2535 printk(KERN_INFO "%s: %s at %s 0x%llx, ", 2535 printk(KERN_INFO "%s: %s at %s 0x%llx, %s\n",
2536 dev->name, typhoon_card_info[card_id].name, 2536 dev->name, typhoon_card_info[card_id].name,
2537 use_mmio ? "MMIO" : "IO", 2537 use_mmio ? "MMIO" : "IO",
2538 (unsigned long long)pci_resource_start(pdev, use_mmio)); 2538 (unsigned long long)pci_resource_start(pdev, use_mmio),
2539 for(i = 0; i < 5; i++) 2539 print_mac(mac, dev->dev_addr));
2540 printk("%2.2x:", dev->dev_addr[i]);
2541 printk("%2.2x\n", dev->dev_addr[i]);
2542 2540
2543 /* xp_resp still contains the response to the READ_VERSIONS command. 2541 /* xp_resp still contains the response to the READ_VERSIONS command.
2544 * For debugging, let the user know what version he has. 2542 * For debugging, let the user know what version he has.