| From a62edb24ce7e83dfbb14a5898028a683171d8e47 Mon Sep 17 00:00:00 2001 |
| From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> |
| Date: Sat, 15 Mar 2014 03:27:54 +0300 |
| Subject: sh_eth: convert pr_*() to netdev_*() calls |
| |
| Convert pr_*() to netdev_*() calls as the latter provide info on a device. |
| |
| Suggested-by: Joe Perches <joe@perches.com> |
| Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| (cherry picked from commit f75f14ec2f7b552dc87b4b57b2a19e487378f774) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/net/ethernet/renesas/sh_eth.c | 9 +++++---- |
| 1 file changed, 5 insertions(+), 4 deletions(-) |
| |
| diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c |
| index 4d3b5b704b39..32daff7fa2d1 100644 |
| --- a/drivers/net/ethernet/renesas/sh_eth.c |
| +++ b/drivers/net/ethernet/renesas/sh_eth.c |
| @@ -421,7 +421,8 @@ static void sh_eth_select_mii(struct net_device *ndev) |
| value = 0x0; |
| break; |
| default: |
| - pr_warn("PHY interface mode was not setup. Set to MII.\n"); |
| + netdev_warn(ndev, |
| + "PHY interface mode was not setup. Set to MII.\n"); |
| value = 0x1; |
| break; |
| } |
| @@ -868,7 +869,7 @@ static int sh_eth_check_reset(struct net_device *ndev) |
| cnt--; |
| } |
| if (cnt <= 0) { |
| - pr_err("Device reset failed\n"); |
| + netdev_err(ndev, "Device reset failed\n"); |
| ret = -ETIMEDOUT; |
| } |
| return ret; |
| @@ -2938,8 +2939,8 @@ static int sh_eth_drv_probe(struct platform_device *pdev) |
| } |
| |
| /* print device information */ |
| - pr_info("Base address at 0x%x, %pM, IRQ %d.\n", |
| - (u32)ndev->base_addr, ndev->dev_addr, ndev->irq); |
| + netdev_info(ndev, "Base address at 0x%x, %pM, IRQ %d.\n", |
| + (u32)ndev->base_addr, ndev->dev_addr, ndev->irq); |
| |
| platform_set_drvdata(pdev, ndev); |
| |
| -- |
| 2.1.2 |
| |