From patchwork Wed Jul 19 15:25:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Zabel X-Patchwork-Id: 791138 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.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=linux-ide-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xCMCM0mtmz9s7g for ; Thu, 20 Jul 2017 01:58:55 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932274AbdGSP6x (ORCPT ); Wed, 19 Jul 2017 11:58:53 -0400 Received: from metis.ext.4.pengutronix.de ([92.198.50.35]:47489 "EHLO metis.ext.4.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754854AbdGSP1a (ORCPT ); Wed, 19 Jul 2017 11:27:30 -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 1dXqsp-0001si-On; Wed, 19 Jul 2017 17:27:27 +0200 From: Philipp Zabel To: linux-kernel@vger.kernel.org Cc: Philipp Zabel , Patrice Chotard , Tejun Heo , linux-ide@vger.kernel.org Subject: [PATCH 004/102] ahci: st: explicitly request exclusive reset control Date: Wed, 19 Jul 2017 17:25:08 +0200 Message-Id: <20170719152646.25903-5-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: linux-ide@vger.kernel.org Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@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: Patrice Chotard Cc: Tejun Heo Cc: linux-ide@vger.kernel.org Signed-off-by: Philipp Zabel --- drivers/ata/ahci_st.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/ata/ahci_st.c b/drivers/ata/ahci_st.c index bc345f2495553..8a26e917dae90 100644 --- a/drivers/ata/ahci_st.c +++ b/drivers/ata/ahci_st.c @@ -108,19 +108,19 @@ static int st_ahci_probe_resets(struct ahci_host_priv *hpriv, { struct st_ahci_drv_data *drv_data = hpriv->plat_data; - drv_data->pwr = devm_reset_control_get(dev, "pwr-dwn"); + drv_data->pwr = devm_reset_control_get_exclusive(dev, "pwr-dwn"); if (IS_ERR(drv_data->pwr)) { dev_info(dev, "power reset control not defined\n"); drv_data->pwr = NULL; } - drv_data->sw_rst = devm_reset_control_get(dev, "sw-rst"); + drv_data->sw_rst = devm_reset_control_get_exclusive(dev, "sw-rst"); if (IS_ERR(drv_data->sw_rst)) { dev_info(dev, "soft reset control not defined\n"); drv_data->sw_rst = NULL; } - drv_data->pwr_rst = devm_reset_control_get(dev, "pwr-rst"); + drv_data->pwr_rst = devm_reset_control_get_exclusive(dev, "pwr-rst"); if (IS_ERR(drv_data->pwr_rst)) { dev_dbg(dev, "power soft reset control not defined\n"); drv_data->pwr_rst = NULL;