diff options
| author | Florian Fainelli <f.fainelli@gmail.com> | 2013-12-06 13:01:37 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-12-09 20:38:59 -0500 |
| commit | 01b0114e068480226bc22fea18c3bccbd815ce8b (patch) | |
| tree | 875c96b0ed05a6b355340d94c3b62e54a3e05ef4 /drivers/net/ethernet/toshiba/tc35815.c | |
| parent | 78de53f05c58784e366b9115575058a5815c89d6 (diff) | |
| download | talos-obmc-linux-01b0114e068480226bc22fea18c3bccbd815ce8b.tar.gz talos-obmc-linux-01b0114e068480226bc22fea18c3bccbd815ce8b.zip | |
net: tc35815: use phy_init_hw for PHY reset
Instead of open-coding the PHY reset through MII BMCR, use phy_init_hw()
which does that for us and also makes sure that any PHY specific fixups
are applied.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/toshiba/tc35815.c')
| -rw-r--r-- | drivers/net/ethernet/toshiba/tc35815.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/drivers/net/ethernet/toshiba/tc35815.c b/drivers/net/ethernet/toshiba/tc35815.c index 1322546d92ac..f6b3212ec339 100644 --- a/drivers/net/ethernet/toshiba/tc35815.c +++ b/drivers/net/ethernet/toshiba/tc35815.c @@ -1170,19 +1170,12 @@ static int tc35815_tx_full(struct net_device *dev) static void tc35815_restart(struct net_device *dev) { struct tc35815_local *lp = netdev_priv(dev); + int ret; if (lp->phy_dev) { - int timeout; - - phy_write(lp->phy_dev, MII_BMCR, BMCR_RESET); - timeout = 100; - while (--timeout) { - if (!(phy_read(lp->phy_dev, MII_BMCR) & BMCR_RESET)) - break; - udelay(1); - } - if (!timeout) - printk(KERN_ERR "%s: BMCR reset failed.\n", dev->name); + ret = phy_init_hw(lp->phy_dev); + if (ret) + printk(KERN_ERR "%s: PHY init failed.\n", dev->name); } spin_lock_bh(&lp->rx_lock); |
