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 82DA7C25B10 for ; Fri, 10 May 2024 07:15:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Ca0DZwEKeAOhC95mGuTrGONX+T2h0KKWZK6Xr2N0PRQ=; b=UGPWu0GWKuXeGo mE6cYIwiz0Vm8Z/JaCK0CJqvJToLUPiwUVFuwatqPgAHtUMrQ+pxE9j76c7SCxKGXzke9UwFeURty ltGeN3KUvoPzS6ZhcX/KUqmbG33x1QwcrhRo8t9ipo+buHzbtNNghCZEn45llNIpzZ5XP4PBCskq4 C2J3q10aTdS6M91Oj3/njKW6yV90neUpxyicXvfI8FK+oUsNtCmxmBSEih5ghLQJ2HMGsmfi7GCJC kOYaKAuylCPOKLF9cdkFnSbBMd4ubO2IZ+pmGTXIqkAKSNYb5Yz2f6vLwH39Pxv8f0bJ9CfAigks+ i0QpAFNzB3w7AiGxavXg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1s5KTG-00000004KzQ-1VZa; Fri, 10 May 2024 07:15:10 +0000 Received: from mail-pf1-x431.google.com ([2607:f8b0:4864:20::431]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1s5KTC-00000004KwU-22UK for linux-arm-kernel@lists.infradead.org; Fri, 10 May 2024 07:15:08 +0000 Received: by mail-pf1-x431.google.com with SMTP id d2e1a72fcca58-6f4521ad6c0so1527731b3a.0 for ; Fri, 10 May 2024 00:15:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715325304; x=1715930104; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1e9AaiZhqzpQxOi3rf8QWQAd00HqbSZFUmUbCLkX+1U=; b=L2bn/4WByMtHltKn8rkb3AV1x9l91dEVuqI6fq3upLvv7jVqUH9z/OuA+JqihYONH4 3azB9dYwOM8xN04rUuSdUPZMA1SRKQ+b3MShYwAWe2J0thMDVHcgKwBai5ODV8TmuZg3 ypUBR9zb+BG7UK1ZgDaCXozfZ2vPYiuOxb/LP4YLrLxdjBlVeOmfajeWBuXjN+uc0j/7 GbMNcjbOVyt5IJcASzETQO9dk8Ld6sOiq5y3LipttoFkqtLuAmnAxqGv9ptAya1grlj6 1UFR1GFCXl8TGPaNSgfJ1sF9AGwyibnmTM9ZAwU0c0N/IPZ/teVkf9r6nvxPl02MboAu SLpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715325304; x=1715930104; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1e9AaiZhqzpQxOi3rf8QWQAd00HqbSZFUmUbCLkX+1U=; b=iQeUV2EZrItP21wQhdGs08/5mNuRdJ9yy265k4wkLLPdXSsFp45jkR9tF+/6vLrqsV ohKdrWHi/bkxJXF9XoZinbm93br4nEHSeVWllKvjDvUAz1nVsX9Ut2od/fujIhByYF96 CjZnXUhQsvOHILSi7hzlzfMZvs4XvmBY3kL56dPSQ70DN/lvXxwL+nuQKZb9I70waNJ7 1j7IxSi+1ygyQs55FJZQZcuJq1271puT1LRR3QPaTHWY6VRpPhfAn8BwMSXqhLYTFlIr fiwU7MNbLT9O5lpTmX7qfByixFt3kPSrHIHj/ZykedkRDdzPsGG381JYBuI1ZvyipbPO QOMA== X-Forwarded-Encrypted: i=1; AJvYcCXjVGGwrNwst2YQdUjiLG+DKXMh7UlnzGbrOK25k1I2WJySIEnyHJn8cO7dkcip92xylBT6gXUHAj3lCEzZBNccf05fIKSbaLW9dGfsBj1mnmeVTo0= X-Gm-Message-State: AOJu0YwcB0e48QlZpeer+1qI929wTK+JpaMugXwEHjCA630z/PTVAjFQ cINRUGdghwwZBad3r6QYwFKi/enuzIwwgtSgFdza0zV6n4ePb/iq X-Google-Smtp-Source: AGHT+IEwUMH0kBFIFoUmUPVo3NgEwfjmKEL/UUFcaYpx/JhNnaWZO9dILpMlR+hxXvDfTz57P+747Q== X-Received: by 2002:a05:6a00:1a93:b0:6ee:1508:edc8 with SMTP id d2e1a72fcca58-6f4e0347d57mr1783419b3a.23.1715325303602; Fri, 10 May 2024 00:15:03 -0700 (PDT) Received: from kousik.local ([2405:201:c01a:90f4:8de5:a651:7145:5260]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-6f4d2af2a37sm2344475b3a.161.2024.05.10.00.15.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 May 2024 00:15:03 -0700 (PDT) From: Kousik Sanagavarapu To: Nishanth Menon , Santosh Shilimkar , Julia Lawall Cc: Shuah Khan , Javier Carrasco , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Kousik Sanagavarapu Subject: [PATCH 3/3] soc: ti: pm33xx: do device_node auto cleanup Date: Fri, 10 May 2024 12:43:24 +0530 Message-ID: <20240510071432.62913-4-five231003@gmail.com> X-Mailer: git-send-email 2.45.0.rc1.8.ge326e52010 In-Reply-To: <20240510071432.62913-1-five231003@gmail.com> References: <20240510071432.62913-1-five231003@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240510_001506_574314_39B2EE0A X-CRM114-Status: GOOD ( 13.08 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 --- 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; } 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; } -mpu_put_node: - of_node_put(np); - return ret; + return 0; } static int am33xx_pm_rtc_setup(void) -- 2.45.0.rc1.8.ge326e52010 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel