From: David S. Miller Date: Wed, 7 Mar 2018 17:30:20 +0000 (-0500) Subject: Merge branch 'net-phy-remove-phy_error-from-phy_disable_interrupts' X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b2b19494b80adc9d0e1e5631a69a24af47a5502c;p=linux.git Merge branch 'net-phy-remove-phy_error-from-phy_disable_interrupts' Heiner Kallweit says: ==================== 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() takes this lock). Make use of this in phy_stop(). v2: - splitted into two separate patches ==================== Signed-off-by: David S. Miller --- b2b19494b80adc9d0e1e5631a69a24af47a5502c