Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754193AbdCPOrI (ORCPT ); Thu, 16 Mar 2017 10:47:08 -0400 Received: from mail-vk0-f47.google.com ([209.85.213.47]:33826 "EHLO mail-vk0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753389AbdCPOrF (ORCPT ); Thu, 16 Mar 2017 10:47:05 -0400 MIME-Version: 1.0 In-Reply-To: <20170315113141.20238-1-p.zabel@pengutronix.de> References: <20170315113141.20238-1-p.zabel@pengutronix.de> From: Ulf Hansson Date: Thu, 16 Mar 2017 15:47:02 +0100 Message-ID: Subject: Re: [PATCH v2 07/14] mmc: sdhci-st: simplify optional reset handling To: Philipp Zabel Cc: "linux-mmc@vger.kernel.org" , Patrice Chotard , Adrian Hunter , "linux-kernel@vger.kernel.org" Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2605 Lines: 82 On 15 March 2017 at 12:31, Philipp Zabel wrote: > As of commit bb475230b8e5 ("reset: make optional functions really > optional"), the reset framework API calls use NULL pointers to describe > optional, non-present reset controls. > > This allows to return errors from devm_reset_control_get_optional and to > call reset_control_(de)assert unconditionally. > > Signed-off-by: Philipp Zabel Thanks, applied for next! Kind regards Uffe > --- > drivers/mmc/host/sdhci-st.c | 19 +++++++------------ > 1 file changed, 7 insertions(+), 12 deletions(-) > > diff --git a/drivers/mmc/host/sdhci-st.c b/drivers/mmc/host/sdhci-st.c > index ed92ce729dde1..5a782b9bae381 100644 > --- a/drivers/mmc/host/sdhci-st.c > +++ b/drivers/mmc/host/sdhci-st.c > @@ -371,11 +371,10 @@ static int sdhci_st_probe(struct platform_device *pdev) > if (IS_ERR(icnclk)) > icnclk = NULL; > > - rstc = devm_reset_control_get(&pdev->dev, NULL); > + rstc = devm_reset_control_get_optional(&pdev->dev, NULL); > if (IS_ERR(rstc)) > - rstc = NULL; > - else > - reset_control_deassert(rstc); > + return PTR_ERR(rstc); > + reset_control_deassert(rstc); > > host = sdhci_pltfm_init(pdev, &sdhci_st_pdata, sizeof(*pdata)); > if (IS_ERR(host)) { > @@ -435,8 +434,7 @@ static int sdhci_st_probe(struct platform_device *pdev) > err_of: > sdhci_pltfm_free(pdev); > err_pltfm_init: > - if (rstc) > - reset_control_assert(rstc); > + reset_control_assert(rstc); > > return ret; > } > @@ -453,8 +451,7 @@ static int sdhci_st_remove(struct platform_device *pdev) > > clk_disable_unprepare(pdata->icnclk); > > - if (rstc) > - reset_control_assert(rstc); > + reset_control_assert(rstc); > > return ret; > } > @@ -470,8 +467,7 @@ static int sdhci_st_suspend(struct device *dev) > if (ret) > goto out; > > - if (pdata->rstc) > - reset_control_assert(pdata->rstc); > + reset_control_assert(pdata->rstc); > > clk_disable_unprepare(pdata->icnclk); > clk_disable_unprepare(pltfm_host->clk); > @@ -489,8 +485,7 @@ static int sdhci_st_resume(struct device *dev) > clk_prepare_enable(pltfm_host->clk); > clk_prepare_enable(pdata->icnclk); > > - if (pdata->rstc) > - reset_control_deassert(pdata->rstc); > + reset_control_deassert(pdata->rstc); > > st_mmcss_cconfig(np, host); > > -- > 2.11.0 >