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/proteon.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/proteon.c')
-rw-r--r-- | drivers/net/tokenring/proteon.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/tokenring/proteon.c b/drivers/net/tokenring/proteon.c index 00ea94513460..cd2d62f76079 100644 --- a/drivers/net/tokenring/proteon.c +++ b/drivers/net/tokenring/proteon.c | |||
@@ -122,7 +122,6 @@ static int __init setup_card(struct net_device *dev, struct device *pdev) | |||
122 | static int versionprinted; | 122 | static int versionprinted; |
123 | const unsigned *port; | 123 | const unsigned *port; |
124 | int j,err = 0; | 124 | int j,err = 0; |
125 | DECLARE_MAC_BUF(mac); | ||
126 | 125 | ||
127 | if (!dev) | 126 | if (!dev) |
128 | return -ENOMEM; | 127 | return -ENOMEM; |
@@ -153,8 +152,8 @@ static int __init setup_card(struct net_device *dev, struct device *pdev) | |||
153 | 152 | ||
154 | proteon_read_eeprom(dev); | 153 | proteon_read_eeprom(dev); |
155 | 154 | ||
156 | printk(KERN_DEBUG "proteon.c: Ring Station Address: %s\n", | 155 | printk(KERN_DEBUG "proteon.c: Ring Station Address: %pM\n", |
157 | print_mac(mac, dev->dev_addr)); | 156 | dev->dev_addr); |
158 | 157 | ||
159 | tp = netdev_priv(dev); | 158 | tp = netdev_priv(dev); |
160 | tp->setnselout = proteon_setnselout_pins; | 159 | tp->setnselout = proteon_setnselout_pins; |