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 47549C3DA4A for ; Wed, 14 Aug 2024 16:40:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Cc: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: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=uaniZZu6+6B1KnOjL4K5IjrWqKXaHiKDuXy25/2yH5Y=; b=wqtGauLxSy17uc +0P/m6vOHlv9EH8dgbfPYYwmxTkkFeW+WB1lupU7uB2ePbOI4CR021F7ATgN75wWiETQfI4qIHJPc piQqZ4/kBOIEe0DvT2EqVTXjMXOrzMADSV0TfHIgd0NnV3XumsfD42N9tiixfG104ZSAjeIATzAfy Ztm65KcLQAXSKJbCggfaWc+bLuIvyTksuVswKC0M73Q0UGNOS3OVB/lwyixtBlvCx4Zv/fIll4lx3 w2VfY5zDZ6yQOH8gq2Gu9prpWwNd7RaY9S9UxG3FDX2F6cNATbMYQRV68iLzOU6ZKggzznz63HMfw MBxSp/7Ob75ob57nqRqQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1seH35-00000007hkL-0YVh; Wed, 14 Aug 2024 16:40:35 +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 1seH1K-00000007hO9-0SNW for linux-arm-kernel@lists.infradead.org; Wed, 14 Aug 2024 16:38:48 +0000 Received: from mail.maildlp.com (unknown [172.18.186.216]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4WkYlC4h9Mz6K6D2; Thu, 15 Aug 2024 00:35:19 +0800 (CST) Received: from lhrpeml500005.china.huawei.com (unknown [7.191.163.240]) by mail.maildlp.com (Postfix) with ESMTPS id 3B165140C98; Thu, 15 Aug 2024 00:38:36 +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; Wed, 14 Aug 2024 17:38:35 +0100 Date: Wed, 14 Aug 2024 17:38:34 +0100 From: Jonathan Cameron To: Krzysztof Kozlowski Subject: Re: [PATCH 1/9] memory: atmel-ebi: use scoped device node handling to simplify error paths Message-ID: <20240814173834.000002c8@Huawei.com> In-Reply-To: <20240812-cleanup-h-of-node-put-memory-v1-1-5065a8f361d2@linaro.org> References: <20240812-cleanup-h-of-node-put-memory-v1-0-5065a8f361d2@linaro.org> <20240812-cleanup-h-of-node-put-memory-v1-1-5065a8f361d2@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: lhrpeml100003.china.huawei.com (7.191.160.210) 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-20240814_093846_470090_12DC8635 X-CRM114-Status: GOOD ( 21.02 ) 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: , Cc: Alexandre Belloni , linux-samsung-soc@vger.kernel.org, Maxime Coquelin , linux-pm@vger.kernel.org, Alexandre Torgue , linux-kernel@vger.kernel.org, Krzysztof Kozlowski , Claudiu Beznea , Thierry Reding , linux-arm-kernel@lists.infradead.org, Alim Akhtar , Santosh Shilimkar , linux-tegra@vger.kernel.org, Jonathan Hunter , linux-stm32@st-md-mailman.stormreply.com, Lukasz Luba Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Mon, 12 Aug 2024 15:33:55 +0200 Krzysztof Kozlowski wrote: > Obtain the device node reference with scoped/cleanup.h to reduce error > handling and make the code a bit simpler. > > Signed-off-by: Krzysztof Kozlowski Hi, Comments inline. > --- > drivers/memory/atmel-ebi.c | 29 ++++++++++------------------- > 1 file changed, 10 insertions(+), 19 deletions(-) > > diff --git a/drivers/memory/atmel-ebi.c b/drivers/memory/atmel-ebi.c > index e8bb5f37f5cb..fcbfc2655d8d 100644 > --- a/drivers/memory/atmel-ebi.c > +++ b/drivers/memory/atmel-ebi.c > @@ -6,6 +6,7 @@ > * Copyright (C) 2013 Jean-Jacques Hiblot > */ > > +#include > #include > #include > #include > @@ -517,7 +518,7 @@ static int atmel_ebi_dev_disable(struct atmel_ebi *ebi, struct device_node *np) > static int atmel_ebi_probe(struct platform_device *pdev) > { > struct device *dev = &pdev->dev; > - struct device_node *child, *np = dev->of_node, *smc_np; > + struct device_node *child, *np = dev->of_node; > struct atmel_ebi *ebi; > int ret, reg_cells; > struct clk *clk; > @@ -541,30 +542,24 @@ static int atmel_ebi_probe(struct platform_device *pdev) > > ebi->clk = clk; > > - smc_np = of_parse_phandle(dev->of_node, "atmel,smc", 0); > + struct device_node *smc_np __free(device_node) = of_parse_phandle(dev->of_node, > + "atmel,smc", 0); Trivial: I'd line break this as > + struct device_node *smc_np __free(device_node) = of_parse_phandle(dev->of_node, "atmel,smc", 0); > > ebi->smc.regmap = syscon_node_to_regmap(smc_np); > - if (IS_ERR(ebi->smc.regmap)) { > - ret = PTR_ERR(ebi->smc.regmap); > - goto put_node; > - } > + if (IS_ERR(ebi->smc.regmap)) > + return PTR_ERR(ebi->smc.regmap); > > ebi->smc.layout = atmel_hsmc_get_reg_layout(smc_np); > - if (IS_ERR(ebi->smc.layout)) { > - ret = PTR_ERR(ebi->smc.layout); > - goto put_node; > - } > + if (IS_ERR(ebi->smc.layout)) > + return PTR_ERR(ebi->smc.layout); > > ebi->smc.clk = of_clk_get(smc_np, 0); > if (IS_ERR(ebi->smc.clk)) { > - if (PTR_ERR(ebi->smc.clk) != -ENOENT) { > - ret = PTR_ERR(ebi->smc.clk); > - goto put_node; > - } > + if (PTR_ERR(ebi->smc.clk) != -ENOENT) > + return PTR_ERR(ebi->smc.clk); > > ebi->smc.clk = NULL; > } > - of_node_put(smc_np); The large change in scope is a bit inelegant as it now hangs on to the smc_np much longer than before. Maybe it's worth pulling out the modified code as a atem_eb_probe_smc(struct device_node *smc_np, struct atmel_ebi_smc *smc ) or something like with a struct_group to define the atmel_ebi_smc That would keep the tight scope for the data and generally simplify it a bit. > ret = clk_prepare_enable(ebi->smc.clk); > if (ret) > return ret; > @@ -615,10 +610,6 @@ static int atmel_ebi_probe(struct platform_device *pdev) > } > > return of_platform_populate(np, NULL, NULL, dev); > - > -put_node: > - of_node_put(smc_np); > - return ret; > } > > static __maybe_unused int atmel_ebi_resume(struct device *dev) >