From patchwork Wed Jul 19 15:25:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Zabel X-Patchwork-Id: 791115 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xCLx66gxjz9s74 for ; Thu, 20 Jul 2017 01:46:34 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933006AbdGSP3R (ORCPT ); Wed, 19 Jul 2017 11:29:17 -0400 Received: from metis.ext.4.pengutronix.de ([92.198.50.35]:44947 "EHLO metis.ext.4.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932988AbdGSP3N (ORCPT ); Wed, 19 Jul 2017 11:29:13 -0400 Received: from dude.hi.pengutronix.de ([2001:67c:670:100:1d::7] helo=dude.pengutronix.de.) by metis.ext.pengutronix.de with esmtp (Exim 4.84_2) (envelope-from ) id 1dXquM-0001si-C6; Wed, 19 Jul 2017 17:29:02 +0200 From: Philipp Zabel To: linux-kernel@vger.kernel.org Cc: Philipp Zabel , Yisen Zhuang , Salil Mehta , netdev@vger.kernel.org Subject: [PATCH 046/102] net: ethernet: hix5hd2_gmac: explicitly request exclusive reset control Date: Wed, 19 Jul 2017 17:25:50 +0200 Message-Id: <20170719152646.25903-47-p.zabel@pengutronix.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170719152646.25903-1-p.zabel@pengutronix.de> References: <20170719152646.25903-1-p.zabel@pengutronix.de> X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::7 X-SA-Exim-Mail-From: p.zabel@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: netdev@vger.kernel.org Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 Cc: Salil Mehta Cc: netdev@vger.kernel.org Signed-off-by: Philipp Zabel --- 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 {