From: Joachim Eastwood <manabian@gmail.com>
To: davem@davemloft.net
Cc: Joachim Eastwood <manabian@gmail.com>,
peppe.cavallaro@st.com, alexandre.torgue@st.com,
netdev@vger.kernel.org
Subject: [net-next v2 6/7] stmmac: dwmac-sti: clean up and rename sti_dwmac_init
Date: Fri, 4 Nov 2016 18:54:10 +0100 [thread overview]
Message-ID: <20161104175411.12943-7-manabian@gmail.com> (raw)
In-Reply-To: <20161104175411.12943-1-manabian@gmail.com>
Rename sti_dwmac_init to sti_dwmac_set_mode which is a better
description for what it really does.
Signed-off-by: Joachim Eastwood <manabian@gmail.com>
Acked-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Tested-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
---
drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c
index b71888a..ac17bff 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c
@@ -229,9 +229,8 @@ static void stid127_fix_retime_src(void *priv, u32 spd)
regmap_update_bits(dwmac->regmap, reg, STID127_RETIME_SRC_MASK, val);
}
-static int sti_dwmac_init(struct platform_device *pdev, void *priv)
+static int sti_dwmac_set_mode(struct sti_dwmac *dwmac)
{
- struct sti_dwmac *dwmac = priv;
struct regmap *regmap = dwmac->regmap;
int iface = dwmac->interface;
u32 reg = dwmac->ctrl_reg;
@@ -245,7 +244,7 @@ static int sti_dwmac_init(struct platform_device *pdev, void *priv)
val = (iface == PHY_INTERFACE_MODE_REVMII) ? 0 : ENMII;
regmap_update_bits(regmap, reg, ENMII_MASK, val);
- dwmac->fix_retime_src(priv, dwmac->speed);
+ dwmac->fix_retime_src(dwmac, dwmac->speed);
return 0;
}
@@ -350,7 +349,7 @@ static int sti_dwmac_probe(struct platform_device *pdev)
if (ret)
return ret;
- ret = sti_dwmac_init(pdev, plat_dat->bsp_priv);
+ ret = sti_dwmac_set_mode(dwmac);
if (ret)
goto disable_clk;
@@ -389,10 +388,9 @@ static int sti_dwmac_suspend(struct device *dev)
static int sti_dwmac_resume(struct device *dev)
{
struct sti_dwmac *dwmac = get_stmmac_bsp_priv(dev);
- struct platform_device *pdev = to_platform_device(dev);
clk_prepare_enable(dwmac->clk);
- sti_dwmac_init(pdev, dwmac);
+ sti_dwmac_set_mode(dwmac);
return stmmac_resume(dev);
}
--
2.10.2
next prev parent reply other threads:[~2016-11-04 17:55 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-04 17:54 [net-next v2 0/7] stmmac: dwmac-sti refactor+cleanup Joachim Eastwood
2016-11-04 17:54 ` [net-next v2 1/7] stmmac: dwmac-sti: remove useless of_node check Joachim Eastwood
2016-11-04 17:54 ` [net-next v2 2/7] stmmac: dwmac-sti: remove clk NULL checks Joachim Eastwood
2016-11-04 17:54 ` [net-next v2 3/7] stmmac: dwmac-sti: add PM ops and resume function Joachim Eastwood
2016-11-04 17:54 ` [net-next v2 4/7] stmmac: dwmac-sti: move st,gmac_en parsing to sti_dwmac_parse_data Joachim Eastwood
2016-11-04 17:54 ` [net-next v2 5/7] stmmac: dwmac-sti: move clk_prepare_enable out of init and add error handling Joachim Eastwood
2016-11-04 17:54 ` Joachim Eastwood [this message]
2016-11-04 17:54 ` [net-next v2 7/7] stmmac: dwmac-sti: remove unused priv dev member Joachim Eastwood
2016-11-07 3:00 ` [net-next v2 0/7] stmmac: dwmac-sti refactor+cleanup David Miller
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=20161104175411.12943-7-manabian@gmail.com \
--to=manabian@gmail.com \
--cc=alexandre.torgue@st.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=peppe.cavallaro@st.com \
/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).