From: Florian Fainelli <f.fainelli@gmail.com>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, s.hauer@pengutronix.de,
b38611@freescale.com, Florian Fainelli <f.fainelli@gmail.com>
Subject: [PATCH net-next 1/4] net: phy: utilize phy_suspend and phy_resume
Date: Mon, 26 Jan 2015 16:31:10 -0800 [thread overview]
Message-ID: <1422318673-9418-2-git-send-email-f.fainelli@gmail.com> (raw)
In-Reply-To: <1422318673-9418-1-git-send-email-f.fainelli@gmail.com>
phy_suspend and phy_resume are an abstraction on top of the PHY device
driver suspend and resume callbacks, utilize those since they are the
proper interface to suspending and resuming a PHY device.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
drivers/net/phy/mdio_bus.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index 50051f271b10..20447741893a 100644
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -465,7 +465,6 @@ static bool mdio_bus_phy_may_suspend(struct phy_device *phydev)
static int mdio_bus_suspend(struct device *dev)
{
- struct phy_driver *phydrv = to_phy_driver(dev->driver);
struct phy_device *phydev = to_phy_device(dev);
/* We must stop the state machine manually, otherwise it stops out of
@@ -479,19 +478,18 @@ static int mdio_bus_suspend(struct device *dev)
if (!mdio_bus_phy_may_suspend(phydev))
return 0;
- return phydrv->suspend(phydev);
+ return phy_suspend(phydev);
}
static int mdio_bus_resume(struct device *dev)
{
- struct phy_driver *phydrv = to_phy_driver(dev->driver);
struct phy_device *phydev = to_phy_device(dev);
int ret;
if (!mdio_bus_phy_may_suspend(phydev))
goto no_resume;
- ret = phydrv->resume(phydev);
+ ret = phy_resume(phydev);
if (ret < 0)
return ret;
--
2.1.0
next prev parent reply other threads:[~2015-01-27 0:31 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-27 0:31 [PATCH net-next 0/4] net: phy: prevent double suspend Florian Fainelli
2015-01-27 0:31 ` Florian Fainelli [this message]
2015-01-27 2:42 ` [PATCH net-next 1/4] net: phy: utilize phy_suspend and phy_resume fugang.duan
2015-01-27 0:31 ` [PATCH net-next 2/4] net: phy: document has_fixups field Florian Fainelli
2015-01-27 0:31 ` [PATCH net-next 3/4] net: phy: keep track of the PHY suspend state Florian Fainelli
2015-01-27 2:43 ` fugang.duan
2015-01-27 5:55 ` Florian Fainelli
2015-01-27 0:31 ` [PATCH net-next 4/4] net: phy: avoid suspending twice a PHY Florian Fainelli
2015-01-27 2:44 ` fugang.duan
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=1422318673-9418-2-git-send-email-f.fainelli@gmail.com \
--to=f.fainelli@gmail.com \
--cc=b38611@freescale.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=s.hauer@pengutronix.de \
/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).