From: Samuel Holland <samuel@sholland.org>
To: Giuseppe Cavallaro <peppe.cavallaro@st.com>,
Alexandre Torgue <alexandre.torgue@st.com>,
Jose Abreu <joabreu@synopsys.com>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
Maxime Ripard <mripard@kernel.org>, Chen-Yu Tsai <wens@csie.org>,
Jernej Skrabec <jernej.skrabec@siol.net>,
Corentin Labbe <clabbe@baylibre.com>
Cc: Ondrej Jirman <megous@megous.com>,
netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, linux-sunxi@googlegroups.com,
Samuel Holland <samuel@sholland.org>
Subject: [PATCH net-next 3/5] net: stmmac: dwmac-sun8i: Use reset_control_reset
Date: Sun, 3 Jan 2021 05:25:40 -0600 [thread overview]
Message-ID: <20210103112542.35149-4-samuel@sholland.org> (raw)
In-Reply-To: <20210103112542.35149-1-samuel@sholland.org>
Use the appropriate function instead of reimplementing it,
and update the error message to match the code.
Signed-off-by: Samuel Holland <samuel@sholland.org>
---
drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
index 3c3d0b99d3e8..0e8d88417251 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
@@ -806,11 +806,9 @@ static int sun8i_dwmac_power_internal_phy(struct stmmac_priv *priv)
/* Make sure the EPHY is properly reseted, as U-Boot may leave
* it at deasserted state, and thus it may fail to reset EMAC.
*/
- reset_control_assert(gmac->rst_ephy);
-
- ret = reset_control_deassert(gmac->rst_ephy);
+ ret = reset_control_reset(gmac->rst_ephy);
if (ret) {
- dev_err(priv->device, "Cannot deassert internal phy\n");
+ dev_err(priv->device, "Cannot reset internal PHY\n");
clk_disable_unprepare(gmac->ephy_clk);
return ret;
}
--
2.26.2
next prev parent reply other threads:[~2021-01-03 11:27 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-03 11:25 [PATCH net-next 0/5] dwmac-sun8i cleanup and shutdown hook Samuel Holland
2021-01-03 11:25 ` [PATCH net-next 1/5] net: stmmac: dwmac-sun8i: Return void from PHY unpower Samuel Holland
2021-01-06 10:00 ` Chen-Yu Tsai
2021-01-03 11:25 ` [PATCH net-next 2/5] net: stmmac: dwmac-sun8i: Remove unnecessary PHY power check Samuel Holland
2021-01-06 10:00 ` Chen-Yu Tsai
2021-01-03 11:25 ` Samuel Holland [this message]
2021-01-06 10:00 ` [PATCH net-next 3/5] net: stmmac: dwmac-sun8i: Use reset_control_reset Chen-Yu Tsai
2021-01-03 11:25 ` [PATCH net-next 4/5] net: stmmac: dwmac-sun8i: Minor probe function cleanup Samuel Holland
2021-01-06 10:01 ` Chen-Yu Tsai
2021-01-03 11:25 ` [PATCH net-next 5/5] net: stmmac: dwmac-sun8i: Add a shutdown callback Samuel Holland
2021-01-06 10:07 ` Chen-Yu Tsai
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=20210103112542.35149-4-samuel@sholland.org \
--to=samuel@sholland.org \
--cc=alexandre.torgue@st.com \
--cc=clabbe@baylibre.com \
--cc=davem@davemloft.net \
--cc=jernej.skrabec@siol.net \
--cc=joabreu@synopsys.com \
--cc=kuba@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sunxi@googlegroups.com \
--cc=megous@megous.com \
--cc=mripard@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=peppe.cavallaro@st.com \
--cc=wens@csie.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).