From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_2 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 94760C433E0 for ; Tue, 29 Dec 2020 17:16:28 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 50EC321D94 for ; Tue, 29 Dec 2020 17:16:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 50EC321D94 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=hbv3Ddeg+VqkFhyWcEjIAPq3N8YSaB6YM586g9iGd9Q=; b=Xx4AWasFcKhAvn/uDUQxFcDOo ELiSLq1ZxVJU0UJF9ktRECbw1RGafsRWdQWQWaDil1KVOIOPx55QbK1RrZPUZP/uk6zxE6vj7lccD jj+pBOOyO+WeQWq1SJ4Yv/2+CpB85Y6N1LVFo5w54QZZoimjtFh2LVEja/tnbw0cf+3s14R7U7uqd 3+pc1w1hz7GMG29nU6ijmKsGl85aCi3XpHQ1aKvCYsi5f2bhc04mJTcaesafxDI2dhU/ri+SMiu64 /mGxFuZjjgUUUgtBNQvvmf7xs/jyeWen5e+suhpkNn1AYHMzyIwlN4mEQpb88+eKY7eSXbYf1GhTe WeUMFiDAQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kuIaB-0007tT-Tx; Tue, 29 Dec 2020 17:14:51 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kuIa8-0007t1-3b for linux-arm-kernel@lists.infradead.org; Tue, 29 Dec 2020 17:14:49 +0000 Received: from archlinux (cpc108967-cmbg20-2-0-cust86.5-4.cable.virginm.net [81.101.6.87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4F6A021D94; Tue, 29 Dec 2020 17:14:44 +0000 (UTC) Date: Tue, 29 Dec 2020 17:14:41 +0000 From: Jonathan Cameron To: Fabrice Gasnier Subject: Re: [PATCH] iio: adc: stm32-adc: Remove redundant null check before clk_prepare_enable/clk_disable_unprepare Message-ID: <20201229171441.5bfa812b@archlinux> In-Reply-To: References: <20201218093512.871-1-vulab@iscas.ac.cn> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201229_121448_305346_D5DC3BAB X-CRM114-Status: GOOD ( 21.47 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: etienne.carriere@st.com, lars@metafoo.de, olivier.moysan@st.com, pmeerw@pmeerw.net, linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, krzk@kernel.org, peter.ujfalusi@ti.com, andy.shevchenko@gmail.com, Xu Wang , mcoquelin.stm32@gmail.com, alexandru.ardelean@analog.com, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, alexandre.torgue@st.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Fri, 18 Dec 2020 15:32:32 +0100 Fabrice Gasnier wrote: > On 12/18/20 10:35 AM, Xu Wang wrote: > > Because clk_prepare_enable() and clk_disable_unprepare() already checked > > NULL clock parameter, so the additional checks are unnecessary, just > > remove them. > > > > Signed-off-by: Xu Wang > > --- > > drivers/iio/adc/stm32-adc-core.c | 29 +++++++++++------------------ > > drivers/iio/adc/stm32-adc.c | 14 +++++--------- > > 2 files changed, 16 insertions(+), 27 deletions(-) > > Hi Xu, > > Acked-by: Fabrice Gasnier Applied, thanks, Jonathan > > Thanks for your patch, > Best Regards, > Fabrice > > > > > diff --git a/drivers/iio/adc/stm32-adc-core.c b/drivers/iio/adc/stm32-adc-core.c > > index 9d1ad6e38e85..c088cb990193 100644 > > --- a/drivers/iio/adc/stm32-adc-core.c > > +++ b/drivers/iio/adc/stm32-adc-core.c > > @@ -535,20 +535,16 @@ static int stm32_adc_core_hw_start(struct device *dev) > > goto err_switches_dis; > > } > > > > - if (priv->bclk) { > > - ret = clk_prepare_enable(priv->bclk); > > - if (ret < 0) { > > - dev_err(dev, "bus clk enable failed\n"); > > - goto err_regulator_disable; > > - } > > + ret = clk_prepare_enable(priv->bclk); > > + if (ret < 0) { > > + dev_err(dev, "bus clk enable failed\n"); > > + goto err_regulator_disable; > > } > > > > - if (priv->aclk) { > > - ret = clk_prepare_enable(priv->aclk); > > - if (ret < 0) { > > - dev_err(dev, "adc clk enable failed\n"); > > - goto err_bclk_disable; > > - } > > + ret = clk_prepare_enable(priv->aclk); > > + if (ret < 0) { > > + dev_err(dev, "adc clk enable failed\n"); > > + goto err_bclk_disable; > > } > > > > writel_relaxed(priv->ccr_bak, priv->common.base + priv->cfg->regs->ccr); > > @@ -556,8 +552,7 @@ static int stm32_adc_core_hw_start(struct device *dev) > > return 0; > > > > err_bclk_disable: > > - if (priv->bclk) > > - clk_disable_unprepare(priv->bclk); > > + clk_disable_unprepare(priv->bclk); > > err_regulator_disable: > > regulator_disable(priv->vref); > > err_switches_dis: > > @@ -575,10 +570,8 @@ static void stm32_adc_core_hw_stop(struct device *dev) > > > > /* Backup CCR that may be lost (depends on power state to achieve) */ > > priv->ccr_bak = readl_relaxed(priv->common.base + priv->cfg->regs->ccr); > > - if (priv->aclk) > > - clk_disable_unprepare(priv->aclk); > > - if (priv->bclk) > > - clk_disable_unprepare(priv->bclk); > > + clk_disable_unprepare(priv->aclk); > > + clk_disable_unprepare(priv->bclk); > > regulator_disable(priv->vref); > > stm32_adc_core_switches_supply_dis(priv); > > regulator_disable(priv->vdda); > > diff --git a/drivers/iio/adc/stm32-adc.c b/drivers/iio/adc/stm32-adc.c > > index c067c994dae2..f7c53cea509a 100644 > > --- a/drivers/iio/adc/stm32-adc.c > > +++ b/drivers/iio/adc/stm32-adc.c > > @@ -546,8 +546,7 @@ static int stm32_adc_hw_stop(struct device *dev) > > if (adc->cfg->unprepare) > > adc->cfg->unprepare(indio_dev); > > > > - if (adc->clk) > > - clk_disable_unprepare(adc->clk); > > + clk_disable_unprepare(adc->clk); > > > > return 0; > > } > > @@ -558,11 +557,9 @@ static int stm32_adc_hw_start(struct device *dev) > > struct stm32_adc *adc = iio_priv(indio_dev); > > int ret; > > > > - if (adc->clk) { > > - ret = clk_prepare_enable(adc->clk); > > - if (ret) > > - return ret; > > - } > > + ret = clk_prepare_enable(adc->clk); > > + if (ret) > > + return ret; > > > > stm32_adc_set_res(adc); > > > > @@ -575,8 +572,7 @@ static int stm32_adc_hw_start(struct device *dev) > > return 0; > > > > err_clk_dis: > > - if (adc->clk) > > - clk_disable_unprepare(adc->clk); > > + clk_disable_unprepare(adc->clk); > > > > return ret; > > } > > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel