]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
phylib: Remove unnecessary "reset" fixups in genphy_setup_forced
authorAndy Fleming <afleming@freescale.com>
Tue, 16 Dec 2008 23:39:48 +0000 (15:39 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 16 Dec 2008 23:39:48 +0000 (15:39 -0800)
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/phy/phy_device.c

index 4cc75a290c06ffb8d0241ceec03fe55d93842212..f84f6a1b530c09cf74c9d7cdc129d11fb97c81ee 100644 (file)
@@ -517,23 +517,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;
 }