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/3c59x.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/3c59x.c')
-rw-r--r-- | drivers/net/3c59x.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c index 9ba295d9dd97..38d58fd9c18d 100644 --- a/drivers/net/3c59x.c +++ b/drivers/net/3c59x.c | |||
@@ -1013,7 +1013,6 @@ static int __devinit vortex_probe1(struct device *gendev, | |||
1013 | const char *print_name = "3c59x"; | 1013 | const char *print_name = "3c59x"; |
1014 | struct pci_dev *pdev = NULL; | 1014 | struct pci_dev *pdev = NULL; |
1015 | struct eisa_device *edev = NULL; | 1015 | struct eisa_device *edev = NULL; |
1016 | DECLARE_MAC_BUF(mac); | ||
1017 | 1016 | ||
1018 | if (!printed_version) { | 1017 | if (!printed_version) { |
1019 | printk (version); | 1018 | printk (version); |
@@ -1206,7 +1205,7 @@ static int __devinit vortex_probe1(struct device *gendev, | |||
1206 | ((__be16 *)dev->dev_addr)[i] = htons(eeprom[i + 10]); | 1205 | ((__be16 *)dev->dev_addr)[i] = htons(eeprom[i + 10]); |
1207 | memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); | 1206 | memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); |
1208 | if (print_info) | 1207 | if (print_info) |
1209 | printk(" %s", print_mac(mac, dev->dev_addr)); | 1208 | printk(" %pM", dev->dev_addr); |
1210 | /* Unfortunately an all zero eeprom passes the checksum and this | 1209 | /* Unfortunately an all zero eeprom passes the checksum and this |
1211 | gets found in the wild in failure cases. Crypto is hard 8) */ | 1210 | gets found in the wild in failure cases. Crypto is hard 8) */ |
1212 | if (!is_valid_ether_addr(dev->dev_addr)) { | 1211 | if (!is_valid_ether_addr(dev->dev_addr)) { |