aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/mv643xx_eth.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2008-10-27 18:59:26 -0400
committerDavid S. Miller <davem@davemloft.net>2008-10-27 20:06:18 -0400
commite174961ca1a0b28f7abf0be47973ad57cb74e5f0 (patch)
treee8f74ecd420a0e380a71670e5aec5c2a0c15640a /drivers/net/mv643xx_eth.c
parent0c68ae2605dbcf67414d8d1f19af93be44b355fb (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/mv643xx_eth.c')
-rw-r--r--drivers/net/mv643xx_eth.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index a9c8c08044b1..3a759d0a7d1a 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -2589,7 +2589,6 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
2589 struct mv643xx_eth_private *mp; 2589 struct mv643xx_eth_private *mp;
2590 struct net_device *dev; 2590 struct net_device *dev;
2591 struct resource *res; 2591 struct resource *res;
2592 DECLARE_MAC_BUF(mac);
2593 int err; 2592 int err;
2594 2593
2595 pd = pdev->dev.platform_data; 2594 pd = pdev->dev.platform_data;
@@ -2683,8 +2682,8 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
2683 if (err) 2682 if (err)
2684 goto out; 2683 goto out;
2685 2684
2686 dev_printk(KERN_NOTICE, &dev->dev, "port %d with MAC address %s\n", 2685 dev_printk(KERN_NOTICE, &dev->dev, "port %d with MAC address %pM\n",
2687 mp->port_num, print_mac(mac, dev->dev_addr)); 2686 mp->port_num, dev->dev_addr);
2688 2687
2689 if (mp->tx_desc_sram_size > 0) 2688 if (mp->tx_desc_sram_size > 0)
2690 dev_printk(KERN_NOTICE, &dev->dev, "configured with sram\n"); 2689 dev_printk(KERN_NOTICE, &dev->dev, "configured with sram\n");