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/at1700.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/at1700.c')
-rw-r--r-- | drivers/net/at1700.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/at1700.c b/drivers/net/at1700.c index 7e874d485d24..18f724581841 100644 --- a/drivers/net/at1700.c +++ b/drivers/net/at1700.c | |||
@@ -265,7 +265,6 @@ static int __init at1700_probe1(struct net_device *dev, int ioaddr) | |||
265 | unsigned int i, irq, is_fmv18x = 0, is_at1700 = 0; | 265 | unsigned int i, irq, is_fmv18x = 0, is_at1700 = 0; |
266 | int slot, ret = -ENODEV; | 266 | int slot, ret = -ENODEV; |
267 | struct net_local *lp = netdev_priv(dev); | 267 | struct net_local *lp = netdev_priv(dev); |
268 | DECLARE_MAC_BUF(mac); | ||
269 | 268 | ||
270 | if (!request_region(ioaddr, AT1700_IO_EXTENT, DRV_NAME)) | 269 | if (!request_region(ioaddr, AT1700_IO_EXTENT, DRV_NAME)) |
271 | return -EBUSY; | 270 | return -EBUSY; |
@@ -397,7 +396,7 @@ found: | |||
397 | dev->dev_addr[i] = val; | 396 | dev->dev_addr[i] = val; |
398 | } | 397 | } |
399 | } | 398 | } |
400 | printk("%s", print_mac(mac, dev->dev_addr)); | 399 | printk("%pM", dev->dev_addr); |
401 | 400 | ||
402 | /* The EEPROM word 12 bit 0x0400 means use regular 100 ohm 10baseT signals, | 401 | /* The EEPROM word 12 bit 0x0400 means use regular 100 ohm 10baseT signals, |
403 | rather than 150 ohm shielded twisted pair compensation. | 402 | rather than 150 ohm shielded twisted pair compensation. |