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/smc-ultra32.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/smc-ultra32.c')
-rw-r--r-- | drivers/net/smc-ultra32.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/smc-ultra32.c b/drivers/net/smc-ultra32.c index a5a91ace28cc..cb6c097a2e0a 100644 --- a/drivers/net/smc-ultra32.c +++ b/drivers/net/smc-ultra32.c | |||
@@ -163,7 +163,6 @@ static int __init ultra32_probe1(struct net_device *dev, int ioaddr) | |||
163 | unsigned char idreg; | 163 | unsigned char idreg; |
164 | unsigned char reg4; | 164 | unsigned char reg4; |
165 | const char *ifmap[] = {"UTP No Link", "", "UTP/AUI", "UTP/BNC"}; | 165 | const char *ifmap[] = {"UTP No Link", "", "UTP/AUI", "UTP/BNC"}; |
166 | DECLARE_MAC_BUF(mac); | ||
167 | 166 | ||
168 | if (!request_region(ioaddr, ULTRA32_IO_EXTENT, DRV_NAME)) | 167 | if (!request_region(ioaddr, ULTRA32_IO_EXTENT, DRV_NAME)) |
169 | return -EBUSY; | 168 | return -EBUSY; |
@@ -207,8 +206,8 @@ static int __init ultra32_probe1(struct net_device *dev, int ioaddr) | |||
207 | for (i = 0; i < 6; i++) | 206 | for (i = 0; i < 6; i++) |
208 | dev->dev_addr[i] = inb(ioaddr + 8 + i); | 207 | dev->dev_addr[i] = inb(ioaddr + 8 + i); |
209 | 208 | ||
210 | printk("%s: %s at 0x%X, %s", | 209 | printk("%s: %s at 0x%X, %pM", |
211 | dev->name, model_name, ioaddr, print_mac(mac, dev->dev_addr)); | 210 | dev->name, model_name, ioaddr, dev->dev_addr); |
212 | 211 | ||
213 | /* Switch from the station address to the alternate register set and | 212 | /* Switch from the station address to the alternate register set and |
214 | read the useful registers there. */ | 213 | read the useful registers there. */ |