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 447EEC27C40 for ; Thu, 24 Aug 2023 09:29:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238033AbjHXJ2t (ORCPT ); Thu, 24 Aug 2023 05:28:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57046 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240751AbjHXJ2d (ORCPT ); Thu, 24 Aug 2023 05:28:33 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F124C19BE for ; Thu, 24 Aug 2023 02:28:25 -0700 (PDT) Received: from kwepemm600014.china.huawei.com (unknown [172.30.72.55]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4RWd2Z0yBCztS6q; Thu, 24 Aug 2023 17:24:38 +0800 (CST) Received: from [10.67.110.164] (10.67.110.164) by kwepemm600014.china.huawei.com (7.193.23.54) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.31; Thu, 24 Aug 2023 17:28:22 +0800 Subject: Re: [PATCH V3] mmc: sdhci-of-dwcmshc: Use helper function devm_clk_get_enabled() To: Adrian Hunter CC: , , Liming Sun , David Thompson , Shawn Lin References: <20230824084629.135361-1-yiyang13@huawei.com> From: "yiyang (D)" Message-ID: Date: Thu, 24 Aug 2023 17:28:22 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.12.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset="utf-8"; format=flowed Content-Transfer-Encoding: 7bit X-Originating-IP: [10.67.110.164] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To kwepemm600014.china.huawei.com (7.193.23.54) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org On 2023/8/24 17:13, Adrian Hunter wrote: > On 24/08/23 11:46, Yi Yang 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 the 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. >> >> Signed-off-by: Yi Yang >> --- >> v3: Fix err check logic >> v2: Remove clk_disable_unprepare in dwcmshc_remove() >> --- >> drivers/mmc/host/sdhci-of-dwcmshc.c | 20 ++++++++------------ >> 1 file changed, 8 insertions(+), 12 deletions(-) >> >> diff --git a/drivers/mmc/host/sdhci-of-dwcmshc.c b/drivers/mmc/host/sdhci-of-dwcmshc.c >> index 31c1892f4ecd..7e1cf78d9695 100644 >> --- a/drivers/mmc/host/sdhci-of-dwcmshc.c >> +++ b/drivers/mmc/host/sdhci-of-dwcmshc.c >> @@ -495,19 +495,19 @@ static int dwcmshc_probe(struct platform_device *pdev) >> priv = sdhci_pltfm_priv(pltfm_host); >> >> if (dev->of_node) { >> - pltfm_host->clk = devm_clk_get(dev, "core"); >> + pltfm_host->clk = devm_clk_get_enabled(dev, "core"); >> if (IS_ERR(pltfm_host->clk)) { >> err = PTR_ERR(pltfm_host->clk); >> - dev_err(dev, "failed to get core clk: %d\n", err); >> + dev_err(dev, "failed to get or enable core clk: %d\n", err); >> goto free_pltfm; >> } >> - err = clk_prepare_enable(pltfm_host->clk); >> - if (err) >> - goto free_pltfm; >> >> - priv->bus_clk = devm_clk_get(dev, "bus"); >> - if (!IS_ERR(priv->bus_clk)) >> - clk_prepare_enable(priv->bus_clk); >> + priv->bus_clk = devm_clk_get_enabled(dev, "bus"); > > This should probably be devm_clk_get_enabled_optional() > Maybe someone who knows the hardware can confirm? > I don't know enough about hardware, Maybe we can wait for someone to confirm the change. >> + if (IS_ERR(priv->bus_clk)) { >> + err = PTR_ERR(priv->bus_clk); >> + dev_err(dev, "failed to get or enable bus clk: %d\n", err); >> + goto free_pltfm; >> + } >> } >> >> err = mmc_of_parse(host->mmc); >> @@ -564,8 +564,6 @@ static int dwcmshc_probe(struct platform_device *pdev) >> err_setup_host: >> sdhci_cleanup_host(host); >> err_clk: >> - clk_disable_unprepare(pltfm_host->clk); >> - clk_disable_unprepare(priv->bus_clk); >> if (rk_priv) >> clk_bulk_disable_unprepare(RK35xx_MAX_CLKS, >> rk_priv->rockchip_clks); >> @@ -583,8 +581,6 @@ static void dwcmshc_remove(struct platform_device *pdev) >> >> sdhci_remove_host(host, 0); >> >> - clk_disable_unprepare(pltfm_host->clk); >> - clk_disable_unprepare(priv->bus_clk); >> if (rk_priv) >> clk_bulk_disable_unprepare(RK35xx_MAX_CLKS, >> rk_priv->rockchip_clks); > > . > -- Yi