From: Heiner Kallweit <hkallweit1@gmail.com>
To: Florian Fainelli <f.fainelli@gmail.com>,
Andrew Lunn <andrew@lunn.ch>,
Geert Uytterhoeven <geert+renesas@glider.be>
Cc: "netdev@vger.kernel.org" <netdev@vger.kernel.org>
Subject: [PATCH RFC v2 6/7] net: phy: use new function phy_stop_suspending in mdio_bus_phy_suspend
Date: Fri, 16 Mar 2018 22:24:50 +0100 [thread overview]
Message-ID: <c7e546d5-328d-3192-73f2-98ada00779f7@gmail.com> (raw)
In-Reply-To: <6618f53c-778a-cb12-deb4-c618a728b43e@gmail.com>
Use new function phy_stop_suspending() in mdio_bus_phy_suspend() to also
disable interrupts and set link state to down.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
v2:
- no changes
---
drivers/net/phy/phy_device.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index ed97f152..a33dec37 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -139,6 +139,7 @@ static bool mdio_bus_phy_needs_start(struct phy_device *phydev)
static int mdio_bus_phy_suspend(struct device *dev)
{
struct phy_device *phydev = to_phy_device(dev);
+ int ret = 0;
/* We must stop the state machine manually, otherwise it stops out of
* control, possibly with the phydev->lock held. Upon resume, netdev
@@ -146,9 +147,11 @@ static int mdio_bus_phy_suspend(struct device *dev)
* lead to a deadlock.
*/
if (phydev->attached_dev && phydev->adjust_link)
- phy_stop_machine(phydev);
+ phy_stop_suspending(phydev);
+ else
+ ret = phy_suspend(phydev);
- return phy_suspend(phydev);
+ return ret;
}
static int mdio_bus_phy_resume(struct device *dev)
--
2.16.2
next prev parent reply other threads:[~2018-03-16 21:25 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-16 21:04 [PATCH RFC v2 0/7] net: phy: patch series aiming to improve few aspects of phylib Heiner Kallweit
2018-03-16 21:14 ` [PATCH RFC v2 1/7] net: phy: unconditionally resume and re-enable interrupts, in phy_start Heiner Kallweit
2018-03-16 21:14 ` [PATCH RFC v2 2/7] net: phy: improve checking for when PHY is allowed to, suspend Heiner Kallweit
2018-03-16 21:15 ` [PATCH RFC v2 3/7] net: phy: resume PHY only if needed in mdio_bus_phy_suspend Heiner Kallweit
2018-03-16 21:15 ` [PATCH RFC v2 4/7] net: phy: remove phy_start_machine Heiner Kallweit
2018-03-16 21:23 ` [PATCH RFC v2 5/7] net: phy: make phy_stop synchronous Heiner Kallweit
2018-03-16 21:24 ` Heiner Kallweit [this message]
2018-03-16 21:25 ` [PATCH RFC v2 7/7] net: phy: remove phy_stop_machine Heiner Kallweit
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c7e546d5-328d-3192-73f2-98ada00779f7@gmail.com \
--to=hkallweit1@gmail.com \
--cc=andrew@lunn.ch \
--cc=f.fainelli@gmail.com \
--cc=geert+renesas@glider.be \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).