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/isa-skeleton.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/isa-skeleton.c')
-rw-r--r-- | drivers/net/isa-skeleton.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/isa-skeleton.c b/drivers/net/isa-skeleton.c index d6ff26af37b3..1c8d72b01247 100644 --- a/drivers/net/isa-skeleton.c +++ b/drivers/net/isa-skeleton.c | |||
@@ -192,7 +192,6 @@ static int __init netcard_probe1(struct net_device *dev, int ioaddr) | |||
192 | static unsigned version_printed; | 192 | static unsigned version_printed; |
193 | int i; | 193 | int i; |
194 | int err = -ENODEV; | 194 | int err = -ENODEV; |
195 | DECLARE_MAC_BUF(mac); | ||
196 | 195 | ||
197 | /* Grab the region so that no one else tries to probe our ioports. */ | 196 | /* Grab the region so that no one else tries to probe our ioports. */ |
198 | if (!request_region(ioaddr, NETCARD_IO_EXTENT, cardname)) | 197 | if (!request_region(ioaddr, NETCARD_IO_EXTENT, cardname)) |
@@ -220,7 +219,7 @@ static int __init netcard_probe1(struct net_device *dev, int ioaddr) | |||
220 | for (i = 0; i < 6; i++) | 219 | for (i = 0; i < 6; i++) |
221 | dev->dev_addr[i] = inb(ioaddr + i); | 220 | dev->dev_addr[i] = inb(ioaddr + i); |
222 | 221 | ||
223 | printk("%s", print_mac(mac, dev->dev_addr)); | 222 | printk("%pM", dev->dev_addr); |
224 | 223 | ||
225 | err = -EAGAIN; | 224 | err = -EAGAIN; |
226 | #ifdef jumpered_interrupts | 225 | #ifdef jumpered_interrupts |