From mboxrd@z Thu Jan 1 00:00:00 1970 From: Heiner Kallweit Subject: [PATCH net-next v2 1/2] net: phy: improve check for when to call phy_resume in mdio_bus_phy_resume Date: Wed, 23 May 2018 22:16:20 +0200 Message-ID: References: <8fe93623-9d05-6182-fe5f-da0bd32bae0b@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Cc: "netdev@vger.kernel.org" To: Andrew Lunn , Florian Fainelli , David Miller Return-path: Received: from mail-wm0-f68.google.com ([74.125.82.68]:38667 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934333AbeEWURd (ORCPT ); Wed, 23 May 2018 16:17:33 -0400 Received: by mail-wm0-f68.google.com with SMTP id m129-v6so12476033wmb.3 for ; Wed, 23 May 2018 13:17:32 -0700 (PDT) In-Reply-To: <8fe93623-9d05-6182-fe5f-da0bd32bae0b@gmail.com> Sender: netdev-owner@vger.kernel.org List-ID: We don't have to do all the checks again which we did in mdio_bus_phy_suspend already. Instead we can simply check whether the PHY is actually suspended and needs to be resumed. Signed-off-by: Heiner Kallweit --- v2: - no changes --- drivers/net/phy/phy_device.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 9e4ba8e80..1662781fb 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -132,14 +132,12 @@ static int mdio_bus_phy_resume(struct device *dev) struct phy_device *phydev = to_phy_device(dev); int ret; - if (!mdio_bus_phy_may_suspend(phydev)) - goto no_resume; - - ret = phy_resume(phydev); - if (ret < 0) - return ret; + if (phydev->suspended) { + ret = phy_resume(phydev); + if (ret < 0) + return ret; + } -no_resume: if (phydev->attached_dev && phydev->adjust_link) phy_start_machine(phydev); -- 2.17.0