diff options
| author | Douglas Anderson <dianders@chromium.org> | 2022-01-05 16:13:50 -0800 |
|---|---|---|
| committer | Douglas Anderson <dianders@chromium.org> | 2022-01-05 16:13:50 -0800 |
| commit | f757b390faab6c38fe0887dc2123dcb615e21953 (patch) | |
| tree | bd3a7c81a775c362693bccaf00e2cef9e07e2eea /drivers/net/phy/phy.c | |
| parent | 443c053f51f9173042a2b45d0db7271cebe78198 (diff) | |
| parent | 4c82fd0506b4cc196a375d1200361fb0c5439acd (diff) | |
Merge remote-tracking branch 'drm-intel/topic/core-for-CI' into drm-tip
Diffstat (limited to 'drivers/net/phy/phy.c')
| -rw-r--r-- | drivers/net/phy/phy.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index beb2b66da132..48977bae20dd 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -939,7 +939,7 @@ void phy_stop_machine(struct phy_device *phydev) */ void phy_error(struct phy_device *phydev) { - WARN_ON(1); + pr_notice_once("%s\n", __func__); mutex_lock(&phydev->lock); phydev->state = PHY_HALTED; @@ -1034,11 +1034,8 @@ void phy_stop(struct phy_device *phydev) { struct net_device *dev = phydev->attached_dev; - if (!phy_is_started(phydev) && phydev->state != PHY_DOWN) { - WARN(1, "called from state %s\n", - phy_state_to_str(phydev->state)); + if (!phy_is_started(phydev) && phydev->state != PHY_DOWN) return; - } mutex_lock(&phydev->lock); |