Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70a55c32 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by David S. Miller
Browse files

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: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4fff2d33

drivers/net/phy/phy.c

+2 −7
Original line number Diff line number Diff line
@@ -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;