[PATCH 046/102] net: ethernet: hix5hd2_gmac: explicitly request exclusive reset control
From: Philipp Zabel <p.zabel@pengutronix.de>
Date: 2017-07-19 15:29:09
Also in:
lkml
Subsystem:
hisilicon network subsystem driver, networking drivers, the rest · Maintainers:
Jian Shen, Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
Commit a53e35db70d1 ("reset: Ensure drivers are explicit when requesting
reset lines") started to transition the reset control request API calls
to explicitly state whether the driver needs exclusive or shared reset
control behavior. Convert all drivers requesting exclusive resets to the
explicit API call so the temporary transition helpers can be removed.
No functional changes.
Cc: Yisen Zhuang <redacted>
Cc: Salil Mehta <redacted>
Cc: netdev@vger.kernel.org
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
drivers/net/ethernet/hisilicon/hix5hd2_gmac.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/hisilicon/hix5hd2_gmac.c b/drivers/net/ethernet/hisilicon/hix5hd2_gmac.c
index 25a6c8722ecac..02b7e2f490099 100644
--- a/drivers/net/ethernet/hisilicon/hix5hd2_gmac.c
+++ b/drivers/net/ethernet/hisilicon/hix5hd2_gmac.c@@ -1161,16 +1161,16 @@ static int hix5hd2_dev_probe(struct platform_device *pdev) goto out_disable_mac_core_clk; } - priv->mac_core_rst = devm_reset_control_get(dev, "mac_core"); + priv->mac_core_rst = devm_reset_control_get_exclusive(dev, "mac_core"); if (IS_ERR(priv->mac_core_rst)) priv->mac_core_rst = NULL; hix5hd2_mac_core_reset(priv); - priv->mac_ifc_rst = devm_reset_control_get(dev, "mac_ifc"); + priv->mac_ifc_rst = devm_reset_control_get_exclusive(dev, "mac_ifc"); if (IS_ERR(priv->mac_ifc_rst)) priv->mac_ifc_rst = NULL; - priv->phy_rst = devm_reset_control_get(dev, "phy"); + priv->phy_rst = devm_reset_control_get_exclusive(dev, "phy"); if (IS_ERR(priv->phy_rst)) { priv->phy_rst = NULL; } else {
--
2.11.0