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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DF970C83F10 for ; Sun, 27 Aug 2023 17:11:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229713AbjH0RLE (ORCPT ); Sun, 27 Aug 2023 13:11:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33188 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229931AbjH0RKu (ORCPT ); Sun, 27 Aug 2023 13:10:50 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CDF54C6 for ; Sun, 27 Aug 2023 10:10:47 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 6471561183 for ; Sun, 27 Aug 2023 17:10:47 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D4D5BC433C7; Sun, 27 Aug 2023 17:10:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1693156246; bh=yyBN1RkRNtTt6+nCdWsSR8o6ej+3NC9RclkocOaWb2U=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=SWivJxxX93fYT2rgvrmrkCI6ntpM4RGMU0M9R/pAibpXREHztPo3UwZnKHBvf+5Yq dS9fzb3xfwyXW274dEr8Z3lEopX4zxx1pSiTBlcuDzdOeB9JqFgMGwLJTProLdi9sK 34QlxxVpTX6gvOArn4igrItttbE17zSQHgAHK2z0Hq6NqkV6eFHtcc1N1eaDxqOg2B 2Sayx7p7bufbFuLgCK7mbI7UC4cUo/z8YoWFrE4IF4x2nei/gV3P6UDjEWn+vi520r l3Tbp8ms3FY/ftIFWotmG4PiUPdOGH8svzLYPDrK2EC/S+SWVClddULtVTerqDvf9t fozH3OYfgV4KA== Date: Sun, 27 Aug 2023 18:11:05 +0100 From: Jonathan Cameron To: Jinjie Ruan Cc: , , , , , , , , Subject: Re: [PATCH -next v2 1/3] iio: adc: at91_adc: Use devm_clk_get_enabled() helper function Message-ID: <20230827181105.399e2bc5@jic23-huawei> In-Reply-To: <20230826022922.3457054-2-ruanjinjie@huawei.com> References: <20230826022922.3457054-1-ruanjinjie@huawei.com> <20230826022922.3457054-2-ruanjinjie@huawei.com> X-Mailer: Claws Mail 4.1.1 (GTK 3.24.38; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org On Sat, 26 Aug 2023 10:29:20 +0800 Jinjie Ruan wrote: > The devm_clk_get_enabled() helper: > - calls devm_clk_get() > - calls clk_prepare_enable() and registers what is needed in order to > call clk_disable_unprepare() when needed, as a managed resource. > > This simplifies the code. > > Signed-off-by: Jinjie Ruan Hi Jinjie, Whilst it probably doesn't introduce a 'real' bug this patch does result in a change of ordering in the remove path that means the irq is now freed before the clks are disabled which is different from previously. Two ways to avoid this. - Do the conversion from patch 2 before this - taking last element out of remove and adding it to be the first devm managed cleanup is always safe. - Squash patches 1 and 2 I'd prefer the first option. Jonathan > --- > drivers/iio/adc/at91_adc.c | 38 ++++++++++---------------------------- > 1 file changed, 10 insertions(+), 28 deletions(-) > > diff --git a/drivers/iio/adc/at91_adc.c b/drivers/iio/adc/at91_adc.c > index de6650f9c4b1..318e33ce22fb 100644 > --- a/drivers/iio/adc/at91_adc.c > +++ b/drivers/iio/adc/at91_adc.c > @@ -1087,32 +1087,20 @@ static int at91_adc_probe(struct platform_device *pdev) > return ret; > } > > - st->clk = devm_clk_get(&pdev->dev, "adc_clk"); > + st->clk = devm_clk_get_enabled(&pdev->dev, "adc_clk"); > if (IS_ERR(st->clk)) { > - dev_err(&pdev->dev, "Failed to get the clock.\n"); > - ret = PTR_ERR(st->clk); > - goto error_free_irq; > - } > - > - ret = clk_prepare_enable(st->clk); > - if (ret) { > dev_err(&pdev->dev, > "Could not prepare or enable the clock.\n"); > + ret = PTR_ERR(st->clk); > goto error_free_irq; > } > > - st->adc_clk = devm_clk_get(&pdev->dev, "adc_op_clk"); > + st->adc_clk = devm_clk_get_enabled(&pdev->dev, "adc_op_clk"); > if (IS_ERR(st->adc_clk)) { > - dev_err(&pdev->dev, "Failed to get the ADC clock.\n"); > - ret = PTR_ERR(st->adc_clk); > - goto error_disable_clk; > - } > - > - ret = clk_prepare_enable(st->adc_clk); > - if (ret) { > dev_err(&pdev->dev, > "Could not prepare or enable the ADC clock.\n"); > - goto error_disable_clk; > + ret = PTR_ERR(st->adc_clk); > + goto error_free_irq; > } > > /* > @@ -1132,7 +1120,7 @@ static int at91_adc_probe(struct platform_device *pdev) > if (!st->startup_time) { > dev_err(&pdev->dev, "No startup time available.\n"); > ret = -EINVAL; > - goto error_disable_adc_clk; > + goto error_free_irq; > } > ticks = (*st->caps->calc_startup_ticks)(st->startup_time, adc_clk_khz); > > @@ -1160,7 +1148,7 @@ static int at91_adc_probe(struct platform_device *pdev) > ret = at91_adc_channel_init(idev); > if (ret < 0) { > dev_err(&pdev->dev, "Couldn't initialize the channels.\n"); > - goto error_disable_adc_clk; > + goto error_free_irq; > } > > init_waitqueue_head(&st->wq_data_avail); > @@ -1175,19 +1163,19 @@ static int at91_adc_probe(struct platform_device *pdev) > ret = at91_adc_buffer_init(idev); > if (ret < 0) { > dev_err(&pdev->dev, "Couldn't initialize the buffer.\n"); > - goto error_disable_adc_clk; > + goto error_free_irq; > } > > ret = at91_adc_trigger_init(idev); > if (ret < 0) { > dev_err(&pdev->dev, "Couldn't setup the triggers.\n"); > at91_adc_buffer_remove(idev); > - goto error_disable_adc_clk; > + goto error_free_irq; > } > } else { > ret = at91_ts_register(idev, pdev); > if (ret) > - goto error_disable_adc_clk; > + goto error_free_irq; > > at91_ts_hw_init(idev, adc_clk_khz); > } > @@ -1207,10 +1195,6 @@ static int at91_adc_probe(struct platform_device *pdev) > } else { > at91_ts_unregister(st); > } > -error_disable_adc_clk: > - clk_disable_unprepare(st->adc_clk); > -error_disable_clk: > - clk_disable_unprepare(st->clk); > error_free_irq: > free_irq(st->irq, idev); > return ret; > @@ -1228,8 +1212,6 @@ static int at91_adc_remove(struct platform_device *pdev) > } else { > at91_ts_unregister(st); > } > - clk_disable_unprepare(st->adc_clk); > - clk_disable_unprepare(st->clk); > free_irq(st->irq, idev); > > return 0;