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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 59D57C52D7C for ; Fri, 23 Aug 2024 11:57:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Subject:CC:To: From:Date:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=EhaD1xsNrtTEQWp3p53ObMmx4gNUrclMjq57s+bILyI=; b=DISYCPd+vC3itUtSf0RhCx3Xdq 0G1fWom3hBYzmw3ZKVyIlZ0d2gtsgEfts0bc9vliMp75NSi0sDrY2vuayZGD5gnSECBs5F6drpq/9 LXMviW2QmhAu2NEhTreDrv/PQDLeBCfAztioP0+6VgcedaRsrbz6FW7p14fpdGvNPC1yOdR+2sWUH lCatheIbpBV5ZrtwtsoU4XS7+rpIMpGHvhzoxr15G7AGHT2+tCmBNfYLzRMCt7FWlSsjb+Nhl6K34 X3rqRO7kKKtWTmXJeXzrPWLpPsOz16QL2XoHa+hVOGdvYl9WvDfe1YvMA/jKcE1VG5AJzwB5Nep51 VC+QrFZA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1shSv6-0000000GbYl-1rug; Fri, 23 Aug 2024 11:57:32 +0000 Received: from frasgout.his.huawei.com ([185.176.79.56]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1shSuK-0000000GbNs-3YsL for linux-arm-kernel@lists.infradead.org; Fri, 23 Aug 2024 11:56:46 +0000 Received: from mail.maildlp.com (unknown [172.18.186.216]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4Wqz3y4sQ8z6K9Pw; Fri, 23 Aug 2024 19:53:34 +0800 (CST) Received: from lhrpeml500005.china.huawei.com (unknown [7.191.163.240]) by mail.maildlp.com (Postfix) with ESMTPS id 1F602140B18; Fri, 23 Aug 2024 19:56:39 +0800 (CST) Received: from localhost (10.203.177.66) by lhrpeml500005.china.huawei.com (7.191.163.240) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.39; Fri, 23 Aug 2024 12:56:38 +0100 Date: Fri, 23 Aug 2024 12:56:37 +0100 From: Jonathan Cameron To: Krzysztof Kozlowski CC: Santosh Shilimkar , Krzysztof Kozlowski , Roger Quadros , Tony Lindgren , Vladimir Zapolskiy , Miquel Raynal , Michal Simek , , , Subject: Re: [PATCH 7/7] memory: pl353-smc: simplify with devm_clk_get_enabled() Message-ID: <20240823125637.00007fe4@Huawei.com> In-Reply-To: <20240823-b4-cleanup-h-guard-v1-7-01668915bd55@linaro.org> References: <20240823-b4-cleanup-h-guard-v1-0-01668915bd55@linaro.org> <20240823-b4-cleanup-h-guard-v1-7-01668915bd55@linaro.org> 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.203.177.66] X-ClientProxiedBy: lhrpeml100001.china.huawei.com (7.191.160.183) To lhrpeml500005.china.huawei.com (7.191.163.240) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240823_045645_211067_5D15CCAD X-CRM114-Status: GOOD ( 19.05 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Fri, 23 Aug 2024 12:16:02 +0200 Krzysztof Kozlowski wrote: > Use devm_clk_get_enabled() to drop clock prepare/unprepare parts and > make code simpler. > > Signed-off-by: Krzysztof Kozlowski LGTM. Follow up suggestion inline. Reviewed-by: Jonathan Cameron > --- > drivers/memory/pl353-smc.c | 36 +++--------------------------------- > 1 file changed, 3 insertions(+), 33 deletions(-) > > diff --git a/drivers/memory/pl353-smc.c b/drivers/memory/pl353-smc.c > index c75b99e49970..994c7a792e34 100644 > --- a/drivers/memory/pl353-smc.c > +++ b/drivers/memory/pl353-smc.c > @@ -75,34 +75,21 @@ static int pl353_smc_probe(struct amba_device *adev, const struct amba_id *id) > const struct of_device_id *match = NULL; > struct pl353_smc_data *pl353_smc; > struct device_node *child; > - int err; > > pl353_smc = devm_kzalloc(&adev->dev, sizeof(*pl353_smc), GFP_KERNEL); > if (!pl353_smc) > return -ENOMEM; > > - pl353_smc->aclk = devm_clk_get(&adev->dev, "apb_pclk"); > + pl353_smc->aclk = devm_clk_get_enabled(&adev->dev, "apb_pclk"); > if (IS_ERR(pl353_smc->aclk)) > return dev_err_probe(&adev->dev, PTR_ERR(pl353_smc->aclk), > "aclk clock not found.\n"); > > - pl353_smc->memclk = devm_clk_get(&adev->dev, "memclk"); > + pl353_smc->memclk = devm_clk_get_enabled(&adev->dev, "memclk"); > if (IS_ERR(pl353_smc->memclk)) > return dev_err_probe(&adev->dev, PTR_ERR(pl353_smc->memclk), > "memclk clock not found.\n"); > > - err = clk_prepare_enable(pl353_smc->aclk); > - if (err) { > - dev_err(&adev->dev, "Unable to enable AXI clock.\n"); > - return err; > - } > - > - err = clk_prepare_enable(pl353_smc->memclk); > - if (err) { > - dev_err(&adev->dev, "Unable to enable memory clock.\n"); > - goto disable_axi_clk; > - } > - > amba_set_drvdata(adev, pl353_smc); > > /* Find compatible children. Only a single child is supported */ > @@ -115,30 +102,14 @@ static int pl353_smc_probe(struct amba_device *adev, const struct amba_id *id) > break; > } > if (!match) { With change below this becomes unconditional as we'll have already returned in the loop for the good path. Might as well use dev_err_probe() here as well to save a few lines. > - err = -ENODEV; > dev_err(&adev->dev, "no matching children\n"); > - goto disable_mem_clk; > + return -ENODEV; > } > > of_platform_device_create(child, NULL, &adev->dev); > of_node_put(child); An additional cleanup looks sensible here. Push this last bit into the loop and use for_each_available_child_of_node_scoped() Assuming you don't already have a patch doing that :) > > return 0; > - > -disable_mem_clk: > - clk_disable_unprepare(pl353_smc->memclk); > -disable_axi_clk: > - clk_disable_unprepare(pl353_smc->aclk); > - > - return err; > -} > - > -static void pl353_smc_remove(struct amba_device *adev) > -{ > - struct pl353_smc_data *pl353_smc = amba_get_drvdata(adev); > - > - clk_disable_unprepare(pl353_smc->memclk); > - clk_disable_unprepare(pl353_smc->aclk); > } > > static const struct amba_id pl353_ids[] = { > @@ -157,7 +128,6 @@ static struct amba_driver pl353_smc_driver = { > }, > .id_table = pl353_ids, > .probe = pl353_smc_probe, > - .remove = pl353_smc_remove, > }; > > module_amba_driver(pl353_smc_driver); >