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.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.c')
-rw-r--r-- | drivers/net/hp.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/hp.c b/drivers/net/hp.c index 0a8c64930ad3..3669194f1063 100644 --- a/drivers/net/hp.c +++ b/drivers/net/hp.c | |||
@@ -127,7 +127,6 @@ static int __init hp_probe1(struct net_device *dev, int ioaddr) | |||
127 | int i, retval, board_id, wordmode; | 127 | int i, retval, board_id, wordmode; |
128 | const char *name; | 128 | const char *name; |
129 | static unsigned version_printed; | 129 | static unsigned version_printed; |
130 | DECLARE_MAC_BUF(mac); | ||
131 | 130 | ||
132 | if (!request_region(ioaddr, HP_IO_EXTENT, DRV_NAME)) | 131 | if (!request_region(ioaddr, HP_IO_EXTENT, DRV_NAME)) |
133 | return -EBUSY; | 132 | return -EBUSY; |
@@ -161,7 +160,7 @@ static int __init hp_probe1(struct net_device *dev, int ioaddr) | |||
161 | for(i = 0; i < ETHER_ADDR_LEN; i++) | 160 | for(i = 0; i < ETHER_ADDR_LEN; i++) |
162 | dev->dev_addr[i] = inb(ioaddr + i); | 161 | dev->dev_addr[i] = inb(ioaddr + i); |
163 | 162 | ||
164 | printk(" %s", print_mac(mac, dev->dev_addr)); | 163 | printk(" %pM", dev->dev_addr); |
165 | 164 | ||
166 | /* Snarf the interrupt now. Someday this could be moved to open(). */ | 165 | /* Snarf the interrupt now. Someday this could be moved to open(). */ |
167 | if (dev->irq < 2) { | 166 | if (dev->irq < 2) { |