net: phy: use phy_disable_interrupts in phy_stop

Now that phy_disable_interrupts() can't take lock phydev->lock any longer,
we can use it to simplify phy_stop().

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index c5aa773eacdcd25727d0a833796a23b8c7ceb899..c2d9027be863beff305b34c3ef149c9c667d08e4 100644 (file)
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -765,13 +765,8 @@ void phy_stop(struct phy_device *phydev)
        if (PHY_HALTED == phydev->state)
                goto out_unlock;
 
-       if (phy_interrupt_is_valid(phydev)) {
-               /* Disable PHY Interrupts */
-               phy_config_interrupt(phydev, PHY_INTERRUPT_DISABLED);
-
-               /* Clear any pending interrupts */
-               phy_clear_interrupt(phydev);
-       }
+       if (phy_interrupt_is_valid(phydev))
+               phy_disable_interrupts(phydev);
 
        phydev->state = PHY_HALTED;