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/rrunner.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/rrunner.c')
-rw-r--r-- | drivers/net/rrunner.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/rrunner.c b/drivers/net/rrunner.c index 3dd8f1342f70..7343291030c5 100644 --- a/drivers/net/rrunner.c +++ b/drivers/net/rrunner.c | |||
@@ -511,7 +511,6 @@ static int __devinit rr_init(struct net_device *dev) | |||
511 | struct rr_private *rrpriv; | 511 | struct rr_private *rrpriv; |
512 | struct rr_regs __iomem *regs; | 512 | struct rr_regs __iomem *regs; |
513 | u32 sram_size, rev; | 513 | u32 sram_size, rev; |
514 | DECLARE_MAC_BUF(mac); | ||
515 | 514 | ||
516 | rrpriv = netdev_priv(dev); | 515 | rrpriv = netdev_priv(dev); |
517 | regs = rrpriv->regs; | 516 | regs = rrpriv->regs; |
@@ -549,7 +548,7 @@ static int __devinit rr_init(struct net_device *dev) | |||
549 | *(__be32 *)(dev->dev_addr+2) = | 548 | *(__be32 *)(dev->dev_addr+2) = |
550 | htonl(rr_read_eeprom_word(rrpriv, offsetof(struct eeprom, manf.BoardULA[4]))); | 549 | htonl(rr_read_eeprom_word(rrpriv, offsetof(struct eeprom, manf.BoardULA[4]))); |
551 | 550 | ||
552 | printk(" MAC: %s\n", print_mac(mac, dev->dev_addr)); | 551 | printk(" MAC: %pM\n", dev->dev_addr); |
553 | 552 | ||
554 | sram_size = rr_read_eeprom_word(rrpriv, 8); | 553 | sram_size = rr_read_eeprom_word(rrpriv, 8); |
555 | printk(" SRAM size 0x%06x\n", sram_size); | 554 | printk(" SRAM size 0x%06x\n", sram_size); |