Commit 4fff2d33 authored Mar 05, 2018 by Heiner Kallweit Committed by David S. Miller Mar 07, 2018

net: phy: remove phy_error from phy_disable_interrupts



All callers of phy_disable_interrupts() call phy_error() in the error
case. Therefore we don't need to do this within the function too.
This change also allows us to use phy_disable_interrupts() in code
holding phydev->lock (because phy_error() can take this lock).

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

parent 4d1e46a5

drivers/net/phy/phy.c

+2 −11

Original line number	Diff line number	Diff line
		@@ -662,19 +662,10 @@ static int phy_disable_interrupts(struct phy_device *phydev)
		/* Disable PHY interrupts */
		err = phy_config_interrupt(phydev, PHY_INTERRUPT_DISABLED);
		if (err)
		goto phy_err;
		return err;

		/* Clear the interrupt */
		err = phy_clear_interrupt(phydev);
		if (err)
		goto phy_err;

		return 0;

		phy_err:
		phy_error(phydev);

		return err;
		return phy_clear_interrupt(phydev);
		}

		/**