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/acenic.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/acenic.c')
-rw-r--r-- | drivers/net/acenic.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/acenic.c b/drivers/net/acenic.c index 66de80b64b92..6eefd93a08f3 100644 --- a/drivers/net/acenic.c +++ b/drivers/net/acenic.c | |||
@@ -892,7 +892,6 @@ static int __devinit ace_init(struct net_device *dev) | |||
892 | int board_idx, ecode = 0; | 892 | int board_idx, ecode = 0; |
893 | short i; | 893 | short i; |
894 | unsigned char cache_size; | 894 | unsigned char cache_size; |
895 | DECLARE_MAC_BUF(mac); | ||
896 | 895 | ||
897 | ap = netdev_priv(dev); | 896 | ap = netdev_priv(dev); |
898 | regs = ap->regs; | 897 | regs = ap->regs; |
@@ -1019,7 +1018,7 @@ static int __devinit ace_init(struct net_device *dev) | |||
1019 | dev->dev_addr[4] = (mac2 >> 8) & 0xff; | 1018 | dev->dev_addr[4] = (mac2 >> 8) & 0xff; |
1020 | dev->dev_addr[5] = mac2 & 0xff; | 1019 | dev->dev_addr[5] = mac2 & 0xff; |
1021 | 1020 | ||
1022 | printk("MAC: %s\n", print_mac(mac, dev->dev_addr)); | 1021 | printk("MAC: %pM\n", dev->dev_addr); |
1023 | 1022 | ||
1024 | /* | 1023 | /* |
1025 | * Looks like this is necessary to deal with on all architectures, | 1024 | * Looks like this is necessary to deal with on all architectures, |