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=-11.6 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,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 9247AC433DF for ; Sun, 12 Jul 2020 12:02:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 71BB620720 for ; Sun, 12 Jul 2020 12:02:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594555349; bh=Y6o64oPzXqnkmkO5D5vSu68cq6MMV4hGP4lea6hgEco=; h=Date:From:To:Cc:Subject:In-Reply-To:References:List-ID:From; b=j9WaU2KlT0lTfbRiJle11uwOSqS1a4pDqz7HNjwREW4wcuEjkeG/0qmIv3XdD35vc 7ftQ5tx1v5XUVWfXF0UZ2xBdp3aTxwlN6lLNThHJyRavZL2hN1kQMQAWbPtqM8JWyf RQo7pgTL7wez5s81IBb+ytAWBCQJAijKk5YI/Lf0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727112AbgGLMC2 (ORCPT ); Sun, 12 Jul 2020 08:02:28 -0400 Received: from mail.kernel.org ([198.145.29.99]:50426 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725765AbgGLMC2 (ORCPT ); Sun, 12 Jul 2020 08:02:28 -0400 Received: from archlinux (cpc149474-cmbg20-2-0-cust94.5-4.cable.virginm.net [82.4.196.95]) (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 A98D7206E2; Sun, 12 Jul 2020 12:02:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594555347; bh=Y6o64oPzXqnkmkO5D5vSu68cq6MMV4hGP4lea6hgEco=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=DZYWlI9x1G3c2Y3/38BcyufUw/DWeM42v2JWmqSr0gj4zdO3STakd7DHta2+gk+/X 9hpUxcALSbsxZvzS0Av/nbEPrfDO7ClqXAC8EDyhxA/CIP9LDJoKDVnTICYroGXFge MfQ42fXtlvx18GIb7vnkJQ7ZT6JeShZqDzSv5NB4= Date: Sun, 12 Jul 2020 13:02:22 +0100 From: Jonathan Cameron To: Artur Rojek Cc: Dmitry Torokhov , Rob Herring , Mark Rutland , Paul Cercueil , Andy Shevchenko , Heiko Stuebner , Ezequiel Garcia , devicetree@vger.kernel.org, linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v8 2/6] IIO: Ingenic JZ47xx: Error check clk_enable calls. Message-ID: <20200712130222.76bf32ed@archlinux> In-Reply-To: <20200709152200.10039-3-contact@artur-rojek.eu> References: <20200709152200.10039-1-contact@artur-rojek.eu> <20200709152200.10039-3-contact@artur-rojek.eu> X-Mailer: Claws Mail 3.17.5 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org On Thu, 9 Jul 2020 17:21:56 +0200 Artur Rojek wrote: > Introduce error checks for the clk_enable calls used in this driver. > As part of the changes, move clk_enable/clk_disable calls out of > ingenic_adc_set_config and into respective logic of its callers. > > Signed-off-by: Artur Rojek > Tested-by: Paul Cercueil Applied. Thanks, Jonathan > --- > > Changes: > > v6: new patch > > v7: no change > > v8: move `clk_disable` outside the lock > > drivers/iio/adc/ingenic-adc.c | 25 +++++++++++++++++++++---- > 1 file changed, 21 insertions(+), 4 deletions(-) > > diff --git a/drivers/iio/adc/ingenic-adc.c b/drivers/iio/adc/ingenic-adc.c > index 39c0a609fc94..c1946a9f1cca 100644 > --- a/drivers/iio/adc/ingenic-adc.c > +++ b/drivers/iio/adc/ingenic-adc.c > @@ -73,7 +73,6 @@ static void ingenic_adc_set_config(struct ingenic_adc *adc, > { > uint32_t cfg; > > - clk_enable(adc->clk); > mutex_lock(&adc->lock); > > cfg = readl(adc->base + JZ_ADC_REG_CFG) & ~mask; > @@ -81,7 +80,6 @@ static void ingenic_adc_set_config(struct ingenic_adc *adc, > writel(cfg, adc->base + JZ_ADC_REG_CFG); > > mutex_unlock(&adc->lock); > - clk_disable(adc->clk); > } > > static void ingenic_adc_enable(struct ingenic_adc *adc, > @@ -124,6 +122,8 @@ static int ingenic_adc_write_raw(struct iio_dev *iio_dev, > long m) > { > struct ingenic_adc *adc = iio_priv(iio_dev); > + struct device *dev = iio_dev->dev.parent; > + int ret; > > switch (m) { > case IIO_CHAN_INFO_SCALE: > @@ -131,6 +131,14 @@ static int ingenic_adc_write_raw(struct iio_dev *iio_dev, > case INGENIC_ADC_BATTERY: > if (!adc->soc_data->battery_vref_mode) > return -EINVAL; > + > + ret = clk_enable(adc->clk); > + if (ret) { > + dev_err(dev, "Failed to enable clock: %d\n", > + ret); > + return ret; > + } > + > if (val > JZ_ADC_BATTERY_LOW_VREF) { > ingenic_adc_set_config(adc, > JZ_ADC_REG_CFG_BAT_MD, > @@ -142,6 +150,9 @@ static int ingenic_adc_write_raw(struct iio_dev *iio_dev, > JZ_ADC_REG_CFG_BAT_MD); > adc->low_vref_mode = true; > } > + > + clk_disable(adc->clk); > + > return 0; > default: > return -EINVAL; > @@ -317,6 +328,13 @@ static int ingenic_adc_read_chan_info_raw(struct ingenic_adc *adc, > int *val) > { > int bit, ret, engine = (chan->channel == INGENIC_ADC_BATTERY); > + struct device *dev = iio_priv_to_dev(adc)->dev.parent; > + > + ret = clk_enable(adc->clk); > + if (ret) { > + dev_err(dev, "Failed to enable clock: %d\n", ret); > + return ret; > + } > > /* We cannot sample AUX/AUX2 in parallel. */ > mutex_lock(&adc->aux_lock); > @@ -325,7 +343,6 @@ static int ingenic_adc_read_chan_info_raw(struct ingenic_adc *adc, > ingenic_adc_set_config(adc, JZ_ADC_REG_CFG_AUX_MD, bit); > } > > - clk_enable(adc->clk); > ret = ingenic_adc_capture(adc, engine); > if (ret) > goto out; > @@ -342,8 +359,8 @@ static int ingenic_adc_read_chan_info_raw(struct ingenic_adc *adc, > > ret = IIO_VAL_INT; > out: > - clk_disable(adc->clk); > mutex_unlock(&adc->aux_lock); > + clk_disable(adc->clk); > > return ret; > }