[PATCH 045/102] net: ethernet: hisi_femac: explicitly request exclusive reset control

From: Philipp Zabel
Date: Wed Jul 19 2017 - 11:49:01 EST


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 <yisen.zhuang@xxxxxxxxxx>
Cc: Salil Mehta <salil.mehta@xxxxxxxxxx>
Cc: netdev@xxxxxxxxxxxxxxx
Signed-off-by: Philipp Zabel <p.zabel@xxxxxxxxxxxxxx>
---
drivers/net/ethernet/hisilicon/hisi_femac.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/hisilicon/hisi_femac.c b/drivers/net/ethernet/hisilicon/hisi_femac.c
index 2c2808830e957..10aa7590afd54 100644
--- a/drivers/net/ethernet/hisilicon/hisi_femac.c
+++ b/drivers/net/ethernet/hisilicon/hisi_femac.c
@@ -838,14 +838,14 @@ static int hisi_femac_drv_probe(struct platform_device *pdev)
goto out_free_netdev;
}

- priv->mac_rst = devm_reset_control_get(dev, "mac");
+ priv->mac_rst = devm_reset_control_get_exclusive(dev, "mac");
if (IS_ERR(priv->mac_rst)) {
ret = PTR_ERR(priv->mac_rst);
goto out_disable_clk;
}
hisi_femac_core_reset(priv);

- 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