]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'net-phy-remove-phy_error-from-phy_disable_interrupts'
authorDavid S. Miller <davem@davemloft.net>
Wed, 7 Mar 2018 17:30:20 +0000 (12:30 -0500)
committerDavid S. Miller <davem@davemloft.net>
Wed, 7 Mar 2018 17:30:20 +0000 (12:30 -0500)
commitfd60f8f3ba824ed112a9c7912c43100050e6bf7b
treeac36f30727a5796381ecb8506bdf9adfb3540ece
parent56240826c3ff70bf2a6085da24b4c2e43aae026c
parent64a83225a0d5b67f63b5ec0d834e5c262957a533
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 <davem@davemloft.net>