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=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 91503C432BE for ; Tue, 31 Aug 2021 07:51:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 70F2660F23 for ; Tue, 31 Aug 2021 07:51:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240045AbhHaHwq convert rfc822-to-8bit (ORCPT ); Tue, 31 Aug 2021 03:52:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59508 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239865AbhHaHwo (ORCPT ); Tue, 31 Aug 2021 03:52:44 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2FCB7C061575 for ; Tue, 31 Aug 2021 00:51:50 -0700 (PDT) Received: from lupine.hi.pengutronix.de ([2001:67c:670:100:3ad5:47ff:feaf:1a17] helo=lupine) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mKyYK-0005uf-BA; Tue, 31 Aug 2021 09:51:28 +0200 Received: from pza by lupine with local (Exim 4.92) (envelope-from ) id 1mKyYF-0002yy-JK; Tue, 31 Aug 2021 09:51:23 +0200 Message-ID: <4bc2bf196efd540933e6a781a44af20142e3d5d3.camel@pengutronix.de> Subject: Re: [v5 09/15] iio: adc: aspeed: Use devm_add_action_or_reset. From: Philipp Zabel To: Billy Tsai , jic23@kernel.org, lars@metafoo.de, pmeerw@pmeerw.net, robh+dt@kernel.org, joel@jms.id.au, andrew@aj.id.au, lgirdwood@gmail.com, broonie@kernel.org, linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-aspeed@lists.ozlabs.org, linux-kernel@vger.kernel.org Cc: BMC-SW@aspeedtech.com Date: Tue, 31 Aug 2021 09:51:23 +0200 In-Reply-To: <20210831071458.2334-10-billy_tsai@aspeedtech.com> References: <20210831071458.2334-1-billy_tsai@aspeedtech.com> <20210831071458.2334-10-billy_tsai@aspeedtech.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8BIT User-Agent: Evolution 3.30.5-1.1 MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2001:67c:670:100:3ad5:47ff:feaf:1a17 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-kernel@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Billy, On Tue, 2021-08-31 at 15:14 +0800, Billy Tsai wrote: > This patch use devm_add_action_or_reset to handle the error in probe > phase. > > Signed-off-by: Billy Tsai > --- > drivers/iio/adc/aspeed_adc.c | 112 +++++++++++++++++++++-------------- > 1 file changed, 66 insertions(+), 46 deletions(-) > > diff --git a/drivers/iio/adc/aspeed_adc.c b/drivers/iio/adc/aspeed_adc.c > index e53d1541ad1d..af00d9752c1e 100644 > --- a/drivers/iio/adc/aspeed_adc.c > +++ b/drivers/iio/adc/aspeed_adc.c [...] > @@ -242,6 +271,11 @@ static int aspeed_adc_probe(struct platform_device *pdev) > &data->clk_lock); > if (IS_ERR(data->clk_prescaler)) > return PTR_ERR(data->clk_prescaler); > + ret = devm_add_action_or_reset(data->dev, > + aspeed_adc_unregister_divider, > + data->clk_prescaler); > + if (ret) > + return ret; I think here you could switch to devm_clk_hw_register_divider() instead. > snprintf(clk_parent_name, ARRAY_SIZE(clk_parent_name), > clk_name); > scaler_flags = CLK_SET_RATE_PARENT; > @@ -256,23 +290,30 @@ static int aspeed_adc_probe(struct platform_device *pdev) > &pdev->dev, clk_name, clk_parent_name, scaler_flags, > data->base + ASPEED_REG_CLOCK_CONTROL, 0, > data->model_data->scaler_bit_width, 0, &data->clk_lock); > - if (IS_ERR(data->clk_scaler)) { > - ret = PTR_ERR(data->clk_scaler); > - goto scaler_error; > - } > + if (IS_ERR(data->clk_scaler)) > + return PTR_ERR(data->clk_scaler); > + > + ret = devm_add_action_or_reset(data->dev, aspeed_adc_unregister_divider, > + data->clk_scaler); > + if (ret) > + return ret; Same as above. [...] > @@ -281,6 +322,10 @@ static int aspeed_adc_probe(struct platform_device *pdev) > ASPEED_ADC_ENGINE_ENABLE, > data->base + ASPEED_REG_ENGINE_CONTROL); > > + ret = devm_add_action_or_reset(data->dev, aspeed_adc_power_down, > + data); > + if (ret) > + return ret; > /* Wait for initial sequence complete. */ > ret = readl_poll_timeout(data->base + ASPEED_REG_ENGINE_CONTROL, > adc_engine_control_reg_val, [...] > @@ -303,6 +354,11 @@ static int aspeed_adc_probe(struct platform_device *pdev) > ASPEED_ADC_ENGINE_ENABLE; > writel(adc_engine_control_reg_val, > data->base + ASPEED_REG_ENGINE_CONTROL); > + ret = devm_add_action_or_reset(data->dev, > + aspeed_adc_power_down, > + data); > + if (ret) > + return ret; Should this be if (!model_dta->wait_init_sequence) ? Otherwise it looks like you've already registered the same aspeed_adc_power_down action above. regards Philipp 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=-14.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 265C6C432BE for ; Tue, 31 Aug 2021 07:53:40 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 E81D160F23 for ; Tue, 31 Aug 2021 07:53:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org E81D160F23 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Date:Cc:To:From:Subject:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ikpNoc4V/dTlDRh77d4lPZiBvnhOXwoBLXGbbJDsays=; b=drKIXi/mB9/ANy unRxU6OGili/9sdjk7D3luW0HAo2rLPrL2ahe7W8yfCcYi+d+hJOcFRWSSZvbHueINH5oFMdLi0nG UpokU5jvaLP2K5k/EUX/mLp9XXkkGUls1ZAtGE7vui0/LLAO4oJJj6jy6GPNlOV6k5sBdplZPYHdc eZ4oPzDaRiMFyzDmkd0wDRqY/zFIQMCpJ+f21+cEs84cDARzyFLwQ2bjHQj7WFLrGMDWFR+aj+uhH wRhSccYNSTGJlDHJcJASq9IQsOCYQQKZAS9my/pLr6pwqaIigq8y0kr78VNzly0mLWcwxzonl9Mx1 h3lv/4HxP8qtf604Dhhg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mKyYc-001k64-0L; Tue, 31 Aug 2021 07:51:46 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mKyYY-001k4n-7f for linux-arm-kernel@lists.infradead.org; Tue, 31 Aug 2021 07:51:43 +0000 Received: from lupine.hi.pengutronix.de ([2001:67c:670:100:3ad5:47ff:feaf:1a17] helo=lupine) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mKyYK-0005uf-BA; Tue, 31 Aug 2021 09:51:28 +0200 Received: from pza by lupine with local (Exim 4.92) (envelope-from ) id 1mKyYF-0002yy-JK; Tue, 31 Aug 2021 09:51:23 +0200 Message-ID: <4bc2bf196efd540933e6a781a44af20142e3d5d3.camel@pengutronix.de> Subject: Re: [v5 09/15] iio: adc: aspeed: Use devm_add_action_or_reset. From: Philipp Zabel To: Billy Tsai , jic23@kernel.org, lars@metafoo.de, pmeerw@pmeerw.net, robh+dt@kernel.org, joel@jms.id.au, andrew@aj.id.au, lgirdwood@gmail.com, broonie@kernel.org, linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-aspeed@lists.ozlabs.org, linux-kernel@vger.kernel.org Cc: BMC-SW@aspeedtech.com Date: Tue, 31 Aug 2021 09:51:23 +0200 In-Reply-To: <20210831071458.2334-10-billy_tsai@aspeedtech.com> References: <20210831071458.2334-1-billy_tsai@aspeedtech.com> <20210831071458.2334-10-billy_tsai@aspeedtech.com> User-Agent: Evolution 3.30.5-1.1 MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2001:67c:670:100:3ad5:47ff:feaf:1a17 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-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210831_005142_339321_4EED6BAD X-CRM114-Status: GOOD ( 17.43 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 Hi Billy, On Tue, 2021-08-31 at 15:14 +0800, Billy Tsai wrote: > This patch use devm_add_action_or_reset to handle the error in probe > phase. > > Signed-off-by: Billy Tsai > --- > drivers/iio/adc/aspeed_adc.c | 112 +++++++++++++++++++++-------------- > 1 file changed, 66 insertions(+), 46 deletions(-) > > diff --git a/drivers/iio/adc/aspeed_adc.c b/drivers/iio/adc/aspeed_adc.c > index e53d1541ad1d..af00d9752c1e 100644 > --- a/drivers/iio/adc/aspeed_adc.c > +++ b/drivers/iio/adc/aspeed_adc.c [...] > @@ -242,6 +271,11 @@ static int aspeed_adc_probe(struct platform_device *pdev) > &data->clk_lock); > if (IS_ERR(data->clk_prescaler)) > return PTR_ERR(data->clk_prescaler); > + ret = devm_add_action_or_reset(data->dev, > + aspeed_adc_unregister_divider, > + data->clk_prescaler); > + if (ret) > + return ret; I think here you could switch to devm_clk_hw_register_divider() instead. > snprintf(clk_parent_name, ARRAY_SIZE(clk_parent_name), > clk_name); > scaler_flags = CLK_SET_RATE_PARENT; > @@ -256,23 +290,30 @@ static int aspeed_adc_probe(struct platform_device *pdev) > &pdev->dev, clk_name, clk_parent_name, scaler_flags, > data->base + ASPEED_REG_CLOCK_CONTROL, 0, > data->model_data->scaler_bit_width, 0, &data->clk_lock); > - if (IS_ERR(data->clk_scaler)) { > - ret = PTR_ERR(data->clk_scaler); > - goto scaler_error; > - } > + if (IS_ERR(data->clk_scaler)) > + return PTR_ERR(data->clk_scaler); > + > + ret = devm_add_action_or_reset(data->dev, aspeed_adc_unregister_divider, > + data->clk_scaler); > + if (ret) > + return ret; Same as above. [...] > @@ -281,6 +322,10 @@ static int aspeed_adc_probe(struct platform_device *pdev) > ASPEED_ADC_ENGINE_ENABLE, > data->base + ASPEED_REG_ENGINE_CONTROL); > > + ret = devm_add_action_or_reset(data->dev, aspeed_adc_power_down, > + data); > + if (ret) > + return ret; > /* Wait for initial sequence complete. */ > ret = readl_poll_timeout(data->base + ASPEED_REG_ENGINE_CONTROL, > adc_engine_control_reg_val, [...] > @@ -303,6 +354,11 @@ static int aspeed_adc_probe(struct platform_device *pdev) > ASPEED_ADC_ENGINE_ENABLE; > writel(adc_engine_control_reg_val, > data->base + ASPEED_REG_ENGINE_CONTROL); > + ret = devm_add_action_or_reset(data->dev, > + aspeed_adc_power_down, > + data); > + if (ret) > + return ret; Should this be if (!model_dta->wait_init_sequence) ? Otherwise it looks like you've already registered the same aspeed_adc_power_down action above. regards Philipp _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel