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 53A3FC3DA66 for ; Wed, 23 Aug 2023 17:16:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237760AbjHWRQV (ORCPT ); Wed, 23 Aug 2023 13:16:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47622 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231433AbjHWRQV (ORCPT ); Wed, 23 Aug 2023 13:16:21 -0400 Received: from frasgout.his.huawei.com (frasgout.his.huawei.com [185.176.79.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ED6E6E67 for ; Wed, 23 Aug 2023 10:16:18 -0700 (PDT) Received: from lhrpeml500005.china.huawei.com (unknown [172.18.147.201]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4RWCSR0Fxdz67Ldy; Thu, 24 Aug 2023 01:12:07 +0800 (CST) Received: from localhost (10.202.227.76) by lhrpeml500005.china.huawei.com (7.191.163.240) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.31; Wed, 23 Aug 2023 18:16:16 +0100 Date: Wed, 23 Aug 2023 18:16:15 +0100 From: Jonathan Cameron To: Li Zetao , , , CC: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , Subject: Re: [PATCH -next v2 24/25] spi: spl022: Use helper function devm_clk_get_enabled() Message-ID: <20230823181615.00007e9f@Huawei.com> In-Reply-To: <20230823133938.1359106-25-lizetao1@huawei.com> References: <20230822131237.1022815-1-lizetao1@huawei.com> <20230823133938.1359106-1-lizetao1@huawei.com> <20230823133938.1359106-25-lizetao1@huawei.com> Organization: Huawei Technologies Research and Development (UK) Ltd. X-Mailer: Claws Mail 4.1.0 (GTK 3.24.33; x86_64-w64-mingw32) MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.202.227.76] X-ClientProxiedBy: lhrpeml500003.china.huawei.com (7.191.162.67) To lhrpeml500005.china.huawei.com (7.191.163.240) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org On Wed, 23 Aug 2023 21:39:37 +0800 Li Zetao wrote: > Since commit 7ef9651e9792 ("clk: Provide new devm_clk helpers for prepared > and enabled clocks"), devm_clk_get() and clk_prepare_enable() can now be > replaced by devm_clk_get_enabled() when driver enables (and possibly > prepares) the clocks for the whole lifetime of the device. Moreover, it is > no longer necessary to unprepare and disable the clocks explicitly. > Moreover, the label "err_no_clk_en" is no used, drop it for clean code. > > Reviewed-by: Linus Walleij > Signed-off-by: Li Zetao FWIW Reviewed-by: Jonathan Cameron If you want to follow up with a patch fixing that odd formatting (on it's own) then that would be great. Jonathan > --- > v1 -> v2: Delete the modification of odd formatting. > > drivers/spi/spi-pl022.c | 11 +---------- > 1 file changed, 1 insertion(+), 10 deletions(-) > > diff --git a/drivers/spi/spi-pl022.c b/drivers/spi/spi-pl022.c > index bb347b6bb6f3..d1b6110b38fc 100644 > --- a/drivers/spi/spi-pl022.c > +++ b/drivers/spi/spi-pl022.c > @@ -2168,19 +2168,13 @@ static int pl022_probe(struct amba_device *adev, const struct amba_id *id) > dev_info(&adev->dev, "mapped registers from %pa to %p\n", > &adev->res.start, pl022->virtbase); > > - pl022->clk = devm_clk_get(&adev->dev, NULL); > + pl022->clk = devm_clk_get_enabled(&adev->dev, NULL); > if (IS_ERR(pl022->clk)) { > status = PTR_ERR(pl022->clk); > dev_err(&adev->dev, "could not retrieve SSP/SPI bus clock\n"); > goto err_no_clk; > } > > - status = clk_prepare_enable(pl022->clk); > - if (status) { > - dev_err(&adev->dev, "could not enable SSP/SPI bus clock\n"); > - goto err_no_clk_en; > - } > - > /* Initialize transfer pump */ > tasklet_init(&pl022->pump_transfers, pump_transfers, > (unsigned long)pl022); > @@ -2240,8 +2234,6 @@ static int pl022_probe(struct amba_device *adev, const struct amba_id *id) > if (platform_info->enable_dma) > pl022_dma_remove(pl022); > err_no_irq: > - clk_disable_unprepare(pl022->clk); > - err_no_clk_en: > err_no_clk: > err_no_ioremap: > amba_release_regions(adev); > @@ -2268,7 +2260,6 @@ pl022_remove(struct amba_device *adev) > if (pl022->host_info->enable_dma) > pl022_dma_remove(pl022); > > - clk_disable_unprepare(pl022->clk); > amba_release_regions(adev); > tasklet_disable(&pl022->pump_transfers); > }