diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2008-10-27 18:59:26 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-10-27 20:06:18 -0400 |
commit | e174961ca1a0b28f7abf0be47973ad57cb74e5f0 (patch) | |
tree | e8f74ecd420a0e380a71670e5aec5c2a0c15640a /drivers/net/typhoon.c | |
parent | 0c68ae2605dbcf67414d8d1f19af93be44b355fb (diff) |
net: convert print_mac to %pM
This converts pretty much everything to print_mac. There were
a few things that had conflicts which I have just dropped for
now, no harm done.
I've built an allyesconfig with this and looked at the files
that weren't built very carefully, but it's a huge patch.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/typhoon.c')
-rw-r--r-- | drivers/net/typhoon.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c index 734ce0977f02..6f191e9f610b 100644 --- a/drivers/net/typhoon.c +++ b/drivers/net/typhoon.c | |||
@@ -2311,7 +2311,6 @@ typhoon_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
2311 | struct cmd_desc xp_cmd; | 2311 | struct cmd_desc xp_cmd; |
2312 | struct resp_desc xp_resp[3]; | 2312 | struct resp_desc xp_resp[3]; |
2313 | int err = 0; | 2313 | int err = 0; |
2314 | DECLARE_MAC_BUF(mac); | ||
2315 | 2314 | ||
2316 | if(!did_version++) | 2315 | if(!did_version++) |
2317 | printk(KERN_INFO "%s", version); | 2316 | printk(KERN_INFO "%s", version); |
@@ -2526,11 +2525,11 @@ typhoon_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
2526 | 2525 | ||
2527 | pci_set_drvdata(pdev, dev); | 2526 | pci_set_drvdata(pdev, dev); |
2528 | 2527 | ||
2529 | printk(KERN_INFO "%s: %s at %s 0x%llx, %s\n", | 2528 | printk(KERN_INFO "%s: %s at %s 0x%llx, %pM\n", |
2530 | dev->name, typhoon_card_info[card_id].name, | 2529 | dev->name, typhoon_card_info[card_id].name, |
2531 | use_mmio ? "MMIO" : "IO", | 2530 | use_mmio ? "MMIO" : "IO", |
2532 | (unsigned long long)pci_resource_start(pdev, use_mmio), | 2531 | (unsigned long long)pci_resource_start(pdev, use_mmio), |
2533 | print_mac(mac, dev->dev_addr)); | 2532 | dev->dev_addr); |
2534 | 2533 | ||
2535 | /* xp_resp still contains the response to the READ_VERSIONS command. | 2534 | /* xp_resp still contains the response to the READ_VERSIONS command. |
2536 | * For debugging, let the user know what version he has. | 2535 | * For debugging, let the user know what version he has. |