diff options
| author | Andy Fleming <afleming@freescale.com> | 2008-12-16 18:39:48 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-16 18:39:48 -0500 |
| commit | f162e97d778ec29492be8eb9bbecb65be976b7c8 (patch) | |
| tree | 4887390602c252537417a602a4478fafe3106047 | |
| parent | 5a5efed4817ef931f648b118aeb9222e53122d2b (diff) | |
phylib: Remove unnecessary "reset" fixups in genphy_setup_forced
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>
| -rw-r--r-- | drivers/net/phy/phy_device.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 4cc75a290c06..f84f6a1b530c 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c | |||
| @@ -517,23 +517,6 @@ int genphy_setup_forced(struct phy_device *phydev) | |||
| 517 | 517 | ||
| 518 | err = phy_write(phydev, MII_BMCR, ctl); | 518 | err = phy_write(phydev, MII_BMCR, ctl); |
| 519 | 519 | ||
| 520 | if (err < 0) | ||
| 521 | return err; | ||
| 522 | |||
| 523 | /* | ||
| 524 | * Run the fixups on this PHY, just in case the | ||
| 525 | * board code needs to change something after a reset | ||
| 526 | */ | ||
| 527 | err = phy_scan_fixups(phydev); | ||
| 528 | |||
| 529 | if (err < 0) | ||
| 530 | return err; | ||
| 531 | |||
| 532 | /* We just reset the device, so we'd better configure any | ||
| 533 | * settings the PHY requires to operate */ | ||
| 534 | if (phydev->drv->config_init) | ||
| 535 | err = phydev->drv->config_init(phydev); | ||
| 536 | |||
| 537 | return err; | 520 | return err; |
| 538 | } | 521 | } |
| 539 | 522 | ||
