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 158C1C30658 for ; Fri, 5 Jul 2024 10:54: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: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=wtVwUO9n7uAWj/ftFgq1AhuijrBFqfK0JrBTwL+m79U=; b=mEnYBi4okpU3BXcfbUefPAlxK2 F2/1NiW3rmDZgmKK5re/emG6k6j2czOixrfBymsqhLdtMb01uCQKfnUmq6tYUZQQB1FcziqblqhMu 5IHEwvs/tDSBoEHrzNoFqO5qUp1N+Ptbw03NwkfxmG+pUs7YdQiHei1dbQK5+7BEKTLtCuKvfw1vV 0somNLgGMyfkwPDUbsgtLGrAjTddIXJ0v38nzQatJowvHlNwO9lAZJzYuvxnOvFsc30A7bKq7F2RT /OjHiDQaSDykMQ92++mZ8avFHTZx6aZmTurm5qKuRdcZN4t7Opvm6Dy4gTxasBLsg7MD0y7XoDZaQ /MgRwYMw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sPgaI-0000000Fi7w-01vd; Fri, 05 Jul 2024 10:54:34 +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 1sPga2-0000000Fi55-2iji for linux-arm-kernel@lists.infradead.org; Fri, 05 Jul 2024 10:54:20 +0000 Received: from mail.maildlp.com (unknown [172.18.186.231]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4WFr2m6Sjbz6K6Jn; Fri, 5 Jul 2024 18:53:04 +0800 (CST) Received: from lhrpeml500005.china.huawei.com (unknown [7.191.163.240]) by mail.maildlp.com (Postfix) with ESMTPS id C2DB0140B38; Fri, 5 Jul 2024 18:54:14 +0800 (CST) Received: from localhost (10.203.174.77) 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, 5 Jul 2024 11:54:14 +0100 Date: Fri, 5 Jul 2024 11:54:13 +0100 From: Jonathan Cameron To: Kousik Sanagavarapu CC: Julia Lawall , Nishanth Menon , Santosh Shilimkar , Nathan Chancellor , Shuah Khan , "Javier Carrasco" , , Subject: Re: [PATCH v2 3/3] soc: ti: pm33xx: do device_node auto cleanup Message-ID: <20240705115413.0000307d@Huawei.com> In-Reply-To: <20240703065710.13786-4-five231003@gmail.com> References: <20240703065710.13786-1-five231003@gmail.com> <20240703065710.13786-4-five231003@gmail.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.203.174.77] X-ClientProxiedBy: lhrpeml500006.china.huawei.com (7.191.161.198) 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-20240705_035419_007107_3D7DAA7F X-CRM114-Status: GOOD ( 16.72 ) 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 Wed, 3 Jul 2024 12:25:28 +0530 Kousik Sanagavarapu wrote: > Use scope based cleanup instead of manual of_node_put() calls, hence > simplifying the handling of error paths. > > Suggested-by: Julia Lawall > Signed-off-by: Kousik Sanagavarapu I think you can make use of dev_err_probe() in here to further simplify things (a bit anyway!) Jonathan > --- > drivers/soc/ti/pm33xx.c | 20 +++++++------------- > 1 file changed, 7 insertions(+), 13 deletions(-) > > diff --git a/drivers/soc/ti/pm33xx.c b/drivers/soc/ti/pm33xx.c > index 8e983c3c4e03..40988c45ed00 100644 > --- a/drivers/soc/ti/pm33xx.c > +++ b/drivers/soc/ti/pm33xx.c > @@ -383,10 +383,9 @@ static void am33xx_pm_free_sram(void) > */ > static int am33xx_pm_alloc_sram(void) > { > - struct device_node *np; > - int ret = 0; > + struct device_node *np __free(device_node) = > + of_find_compatible_node(NULL, NULL, "ti,omap3-mpu"); > > - np = of_find_compatible_node(NULL, NULL, "ti,omap3-mpu"); > if (!np) { > np = of_find_compatible_node(NULL, NULL, "ti,omap4-mpu"); > if (!np) { > @@ -400,24 +399,21 @@ static int am33xx_pm_alloc_sram(void) > if (!sram_pool) { > dev_err(pm33xx_dev, "PM: %s: Unable to get sram pool for ocmcram\n", > __func__); > - ret = -ENODEV; > - goto mpu_put_node; > + return -ENODEV; > } > > sram_pool_data = of_gen_pool_get(np, "pm-sram", 1); > if (!sram_pool_data) { > dev_err(pm33xx_dev, "PM: %s: Unable to get sram data pool for ocmcram\n", > __func__); > - ret = -ENODEV; > - goto mpu_put_node; > + return -ENODEV; > } > > ocmcram_location = gen_pool_alloc(sram_pool, *pm_sram->do_wfi_sz); > if (!ocmcram_location) { > dev_err(pm33xx_dev, "PM: %s: Unable to allocate memory from ocmcram\n", > __func__); > - ret = -ENOMEM; > - goto mpu_put_node; > + return -ENOMEM; Why not dev_err_probe()? Seems to only be called from a probe() callback. > } > > ocmcram_location_data = gen_pool_alloc(sram_pool_data, > @@ -425,12 +421,10 @@ static int am33xx_pm_alloc_sram(void) > if (!ocmcram_location_data) { > dev_err(pm33xx_dev, "PM: Unable to allocate memory from ocmcram\n"); > gen_pool_free(sram_pool, ocmcram_location, *pm_sram->do_wfi_sz); > - ret = -ENOMEM; > + return -ENOMEM; I doubt the ordering matters so can probably do dev_err_probe() in here. > } > > -mpu_put_node: > - of_node_put(np); > - return ret; > + return 0; > } > > static int am33xx_pm_rtc_setup(void)