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/wireless/rtl8180_dev.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/wireless/rtl8180_dev.c')
-rw-r--r-- | drivers/net/wireless/rtl8180_dev.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/rtl8180_dev.c b/drivers/net/wireless/rtl8180_dev.c index df7e78ee8a88..9de8f57486df 100644 --- a/drivers/net/wireless/rtl8180_dev.c +++ b/drivers/net/wireless/rtl8180_dev.c | |||
@@ -806,7 +806,6 @@ static int __devinit rtl8180_probe(struct pci_dev *pdev, | |||
806 | const char *chip_name, *rf_name = NULL; | 806 | const char *chip_name, *rf_name = NULL; |
807 | u32 reg; | 807 | u32 reg; |
808 | u16 eeprom_val; | 808 | u16 eeprom_val; |
809 | DECLARE_MAC_BUF(mac); | ||
810 | 809 | ||
811 | err = pci_enable_device(pdev); | 810 | err = pci_enable_device(pdev); |
812 | if (err) { | 811 | if (err) { |
@@ -1002,8 +1001,8 @@ static int __devinit rtl8180_probe(struct pci_dev *pdev, | |||
1002 | goto err_iounmap; | 1001 | goto err_iounmap; |
1003 | } | 1002 | } |
1004 | 1003 | ||
1005 | printk(KERN_INFO "%s: hwaddr %s, %s + %s\n", | 1004 | printk(KERN_INFO "%s: hwaddr %pM, %s + %s\n", |
1006 | wiphy_name(dev->wiphy), print_mac(mac, dev->wiphy->perm_addr), | 1005 | wiphy_name(dev->wiphy), dev->wiphy->perm_addr, |
1007 | chip_name, priv->rf->name); | 1006 | chip_name, priv->rf->name); |
1008 | 1007 | ||
1009 | return 0; | 1008 | return 0; |