[RFC PATCH 11/17] sh_eth: Don't unnecessarily reset the PHY

From: Kyle Moffett
Date: Thu Oct 20 2011 - 17:13:42 EST


The PHY is already reset during driver probing, and this manual reset
afterwards will wipe out board-specific PHY fixups and driver-specific
phy->drv->config_init() register tweaks.

Signed-off-by: Kyle Moffett <Kyle.D.Moffett@xxxxxxxxxx>
---
drivers/net/sh_eth.c | 19 +------------------
1 files changed, 1 insertions(+), 18 deletions(-)

diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index 1c1666e..7ef4378 100644
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@ -1235,23 +1235,6 @@ static int sh_eth_phy_init(struct net_device *ndev)
return 0;
}

-/* PHY control start function */
-static int sh_eth_phy_start(struct net_device *ndev)
-{
- struct sh_eth_private *mdp = netdev_priv(ndev);
- int ret;
-
- ret = sh_eth_phy_init(ndev);
- if (ret)
- return ret;
-
- /* reset phy - this also wakes it from PDOWN */
- phy_write(mdp->phydev, MII_BMCR, BMCR_RESET);
- phy_start(mdp->phydev);
-
- return 0;
-}
-
static int sh_eth_get_settings(struct net_device *ndev,
struct ethtool_cmd *ecmd)
{
@@ -1410,7 +1393,7 @@ static int sh_eth_open(struct net_device *ndev)
goto out_free_irq;

/* PHY control start*/
- ret = sh_eth_phy_start(ndev);
+ ret = sh_eth_phy_init(ndev);
if (ret)
goto out_free_irq;

--
1.7.2.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/