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/hp-plus.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/hp-plus.c')
-rw-r--r-- | drivers/net/hp-plus.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/hp-plus.c b/drivers/net/hp-plus.c index fbbd3e660c27..9026fd6ea0ff 100644 --- a/drivers/net/hp-plus.c +++ b/drivers/net/hp-plus.c | |||
@@ -166,7 +166,6 @@ static int __init hpp_probe1(struct net_device *dev, int ioaddr) | |||
166 | const char name[] = "HP-PC-LAN+"; | 166 | const char name[] = "HP-PC-LAN+"; |
167 | int mem_start; | 167 | int mem_start; |
168 | static unsigned version_printed; | 168 | static unsigned version_printed; |
169 | DECLARE_MAC_BUF(mac); | ||
170 | 169 | ||
171 | if (!request_region(ioaddr, HP_IO_EXTENT, DRV_NAME)) | 170 | if (!request_region(ioaddr, HP_IO_EXTENT, DRV_NAME)) |
172 | return -EBUSY; | 171 | return -EBUSY; |
@@ -193,7 +192,7 @@ static int __init hpp_probe1(struct net_device *dev, int ioaddr) | |||
193 | } | 192 | } |
194 | checksum += inb(ioaddr + 14); | 193 | checksum += inb(ioaddr + 14); |
195 | 194 | ||
196 | printk("%s", print_mac(mac, dev->dev_addr)); | 195 | printk("%pM", dev->dev_addr); |
197 | 196 | ||
198 | if (checksum != 0xff) { | 197 | if (checksum != 0xff) { |
199 | printk(" bad checksum %2.2x.\n", checksum); | 198 | printk(" bad checksum %2.2x.\n", checksum); |