[PATCH CFT] net: phy: micrel: remove unnecessary duplicate interrupt enable

[PATCH CFT] net: phy: micrel: remove unnecessary duplicate interrupt enable

[Russell King]

Now that we call phy_resume() before enabling interrupts, the workaround
in micrel is no longer required.

Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
---
This depends on the previous "net: phy: fix resume handling" patch, but
is not necessary to be a part of it.  Since kszphy_resume() is used for
PHYs which I don't have, I can't test this, so I decided to keep it
separate.  Can we get it tested on KSZ8081, KSZ8091 or KSZ9031 PHYs?

 drivers/net/phy/micrel.c | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
index fdb43dd9b5cd..9e9438caa2b7 100644
--- a/drivers/net/phy/micrel.c
+++ b/drivers/net/phy/micrel.c
@@ -711,22 +711,9 @@ static int kszphy_suspend(struct phy_device *phydev)
 
 static int kszphy_resume(struct phy_device *phydev)
 {
-	int ret;
-
 	genphy_resume(phydev);
 
-	ret = kszphy_config_reset(phydev);
-	if (ret)
-		return ret;
-
-	/* Enable PHY Interrupts */
-	if (phy_interrupt_is_valid(phydev)) {
-		phydev->interrupts = PHY_INTERRUPT_ENABLED;
-		if (phydev->drv->config_intr)
-			phydev->drv->config_intr(phydev);
-	}
-
-	return 0;
+	return kszphy_config_reset(phydev);
 }
 
 static int kszphy_probe(struct phy_device *phydev)
-- 
2.7.4

Re: [PATCH CFT] net: phy: micrel: remove unnecessary duplicate interrupt enable

[David Miller]

From: Russell King <rmk+kernel@armlinux.org.uk>
Date: Tue, 12 Dec 2017 11:02:12 +0000

> Now that we call phy_resume() before enabling interrupts, the workaround
> in micrel is no longer required.
> 
> Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
> ---
> This depends on the previous "net: phy: fix resume handling" patch, but
> is not necessary to be a part of it.  Since kszphy_resume() is used for
> PHYs which I don't have, I can't test this, so I decided to keep it
> separate.  Can we get it tested on KSZ8081, KSZ8091 or KSZ9031 PHYs?

Russell, please repost this once someone does some testing.

Yes, I realize it can be difficult to obtain this, but please
do your best.