Patchwork phylib: Remove unnecessary "reset" fixups in genphy_setup_forced

login
register
mail settings
Submitter Andy Fleming
Date Dec. 16, 2008, 11:16 p.m.
Message ID <1229469389-24926-1-git-send-email-afleming@freescale.com>
Download mbox | patch
Permalink /patch/14359/
State Accepted
Delegated to: David Miller
Headers show

Comments

Andy Fleming - Dec. 16, 2008, 11:16 p.m.
genphy_setup_forced hasn't actually reset the PHY for a long time,
but a comment to that effect remained in the code, so code continued
to act as if it *had* reset the PHY, and called the necessary fixup
functions to respond to a PHY reset.  With no reset, those functions
are no longer needed, so we remove them.

Signed-off-by: Andy Fleming <afleming@freescale.com>
---
 drivers/net/phy/phy_device.c |   17 -----------------
 1 files changed, 0 insertions(+), 17 deletions(-)
David Miller - Dec. 16, 2008, 11:39 p.m.
From: Andy Fleming <afleming@freescale.com>
Date: Tue, 16 Dec 2008 17:16:29 -0600

> genphy_setup_forced hasn't actually reset the PHY for a long time,
> but a comment to that effect remained in the code, so code continued
> to act as if it *had* reset the PHY, and called the necessary fixup
> functions to respond to a PHY reset.  With no reset, those functions
> are no longer needed, so we remove them.
> 
> Signed-off-by: Andy Fleming <afleming@freescale.com>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index e976c1c..b312d9c 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -508,23 +508,6 @@  int genphy_setup_forced(struct phy_device *phydev)
 	
 	err = phy_write(phydev, MII_BMCR, ctl);
 
-	if (err < 0)
-		return err;
-
-	/*
-	 * Run the fixups on this PHY, just in case the
-	 * board code needs to change something after a reset
-	 */
-	err = phy_scan_fixups(phydev);
-
-	if (err < 0)
-		return err;
-
-	/* We just reset the device, so we'd better configure any
-	 * settings the PHY requires to operate */
-	if (phydev->drv->config_init)
-		err = phydev->drv->config_init(phydev);
-
 	return err;
 }