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/tokenring/skisa.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/tokenring/skisa.c')
-rw-r--r-- | drivers/net/tokenring/skisa.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/tokenring/skisa.c b/drivers/net/tokenring/skisa.c index 41b6999a0f33..b578744311b0 100644 --- a/drivers/net/tokenring/skisa.c +++ b/drivers/net/tokenring/skisa.c | |||
@@ -139,7 +139,6 @@ static int __init setup_card(struct net_device *dev, struct device *pdev) | |||
139 | static int versionprinted; | 139 | static int versionprinted; |
140 | const unsigned *port; | 140 | const unsigned *port; |
141 | int j, err = 0; | 141 | int j, err = 0; |
142 | DECLARE_MAC_BUF(mac); | ||
143 | 142 | ||
144 | if (!dev) | 143 | if (!dev) |
145 | return -ENOMEM; | 144 | return -ENOMEM; |
@@ -170,8 +169,8 @@ static int __init setup_card(struct net_device *dev, struct device *pdev) | |||
170 | 169 | ||
171 | sk_isa_read_eeprom(dev); | 170 | sk_isa_read_eeprom(dev); |
172 | 171 | ||
173 | printk(KERN_DEBUG "skisa.c: Ring Station Address: %s\n", | 172 | printk(KERN_DEBUG "skisa.c: Ring Station Address: %pM\n", |
174 | print_mac(mac, dev->dev_addr)); | 173 | dev->dev_addr); |
175 | 174 | ||
176 | tp = netdev_priv(dev); | 175 | tp = netdev_priv(dev); |
177 | tp->setnselout = sk_isa_setnselout_pins; | 176 | tp->setnselout = sk_isa_setnselout_pins; |