From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f194.google.com ([209.85.128.194]:42224 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932575AbeCEVey (ORCPT ); Mon, 5 Mar 2018 16:34:54 -0500 Received: by mail-wr0-f194.google.com with SMTP id k9so18807331wre.9 for ; Mon, 05 Mar 2018 13:34:54 -0800 (PST) From: Heiner Kallweit Subject: [PATCH v2 net-next 2/2] net: phy: use phy_disable_interrupts in phy_stop To: Andrew Lunn , Florian Fainelli , David Miller Cc: "netdev@vger.kernel.org" References: <7a212841-6499-18be-b646-33ea69fb7da2@gmail.com> Message-ID: Date: Mon, 5 Mar 2018 22:34:46 +0100 MIME-Version: 1.0 In-Reply-To: <7a212841-6499-18be-b646-33ea69fb7da2@gmail.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Sender: netdev-owner@vger.kernel.org List-ID: Now that phy_disable_interrupts() can't take lock phydev->lock any longer, we can use it to simplify phy_stop(). Signed-off-by: Heiner Kallweit --- drivers/net/phy/phy.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index c5aa773ea..c2d9027be 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -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; -- 2.16.2