net: phy: use phy_disable_interrupts in phy_stop
authorHeiner Kallweit <hkallweit1@gmail.com>
Mon, 5 Mar 2018 21:34:46 +0000 (22:34 +0100)
committerDavid S. Miller <davem@davemloft.net>
Wed, 7 Mar 2018 17:30:20 +0000 (12:30 -0500)
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>
drivers/net/phy/phy.c

index c5aa773..c2d9027 100644 (file)
@@ -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;