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 0530DC4320E for ; Tue, 31 Aug 2021 07:51:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D41DF60F3A for ; Tue, 31 Aug 2021 07:51:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240035AbhHaHwn convert rfc822-to-8bit (ORCPT ); Tue, 31 Aug 2021 03:52:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59496 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239865AbhHaHwn (ORCPT ); Tue, 31 Aug 2021 03:52:43 -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 6ACCDC061575 for ; Tue, 31 Aug 2021 00:51:48 -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: devicetree@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@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