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/atmel.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/atmel.c')
-rw-r--r-- | drivers/net/wireless/atmel.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c index ecb02bdaab5b..6e20552c1881 100644 --- a/drivers/net/wireless/atmel.c +++ b/drivers/net/wireless/atmel.c | |||
@@ -1479,7 +1479,6 @@ struct net_device *init_atmel_card(unsigned short irq, unsigned long port, | |||
1479 | struct net_device *dev; | 1479 | struct net_device *dev; |
1480 | struct atmel_private *priv; | 1480 | struct atmel_private *priv; |
1481 | int rc; | 1481 | int rc; |
1482 | DECLARE_MAC_BUF(mac); | ||
1483 | 1482 | ||
1484 | /* Create the network device object. */ | 1483 | /* Create the network device object. */ |
1485 | dev = alloc_etherdev(sizeof(*priv)); | 1484 | dev = alloc_etherdev(sizeof(*priv)); |
@@ -1591,8 +1590,8 @@ struct net_device *init_atmel_card(unsigned short irq, unsigned long port, | |||
1591 | if (!ent) | 1590 | if (!ent) |
1592 | printk(KERN_WARNING "atmel: unable to create /proc entry.\n"); | 1591 | printk(KERN_WARNING "atmel: unable to create /proc entry.\n"); |
1593 | 1592 | ||
1594 | printk(KERN_INFO "%s: Atmel at76c50x. Version %d.%d. MAC %s\n", | 1593 | printk(KERN_INFO "%s: Atmel at76c50x. Version %d.%d. MAC %pM\n", |
1595 | dev->name, DRIVER_MAJOR, DRIVER_MINOR, print_mac(mac, dev->dev_addr)); | 1594 | dev->name, DRIVER_MAJOR, DRIVER_MINOR, dev->dev_addr); |
1596 | 1595 | ||
1597 | return dev; | 1596 | return dev; |
1598 | 1597 | ||