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/ni5010.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/ni5010.c')
-rw-r--r-- | drivers/net/ni5010.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ni5010.c b/drivers/net/ni5010.c index 8e0ca9f4e404..e88ec8a2f837 100644 --- a/drivers/net/ni5010.c +++ b/drivers/net/ni5010.c | |||
@@ -203,7 +203,6 @@ static int __init ni5010_probe1(struct net_device *dev, int ioaddr) | |||
203 | unsigned int data = 0; | 203 | unsigned int data = 0; |
204 | int boguscount = 40; | 204 | int boguscount = 40; |
205 | int err = -ENODEV; | 205 | int err = -ENODEV; |
206 | DECLARE_MAC_BUF(mac); | ||
207 | 206 | ||
208 | dev->base_addr = ioaddr; | 207 | dev->base_addr = ioaddr; |
209 | dev->irq = irq; | 208 | dev->irq = irq; |
@@ -271,7 +270,7 @@ static int __init ni5010_probe1(struct net_device *dev, int ioaddr) | |||
271 | outw(i, IE_GP); | 270 | outw(i, IE_GP); |
272 | dev->dev_addr[i] = inb(IE_SAPROM); | 271 | dev->dev_addr[i] = inb(IE_SAPROM); |
273 | } | 272 | } |
274 | printk("%s ", print_mac(mac, dev->dev_addr)); | 273 | printk("%pM ", dev->dev_addr); |
275 | 274 | ||
276 | PRINTK2((KERN_DEBUG "%s: I/O #4 passed!\n", dev->name)); | 275 | PRINTK2((KERN_DEBUG "%s: I/O #4 passed!\n", dev->name)); |
277 | 276 | ||