From patchwork Sun Aug 25 08:48:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kousik Sanagavarapu X-Patchwork-Id: 13776725 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 DE65DC5320E for ; Sun, 25 Aug 2024 09:01:39 +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: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=UmISYgMpUlAe9Yh2xMwNMd95DBbU9NeKqHPqX7UpJnU=; b=eZzK81jmL1l/7Uzu9lZWK300J/ wT3/eg1swvRFn32VfA1Mn+bXES1ELasfUPLmxKGZJmW2NKQpeKYDv/Xgo5003PGl9NckC/a38kB/W kUQc1zMFpcxDe7xA8L7RNXOBcKdafwtPd+c3bqa47BAgYNMwyRiNTWUsnbAzhjyuK4OMqNxQ2TSXP XbMvGqiPVqVUetggCkJxb2Bz8XclCdzsPvt51w5qLTpWi0FceGA17xRMo5zTH6aMGew7gsbv0JBQi Dm3XUnqXqzWkve2/b/4RCb4ZpHBvxEfAQLHLeMvWD/YyVHmZjmGPIo1M1dWO3ZGeCdBAqU0y9/hE9 hVk3hS9g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1si97n-000000041LD-08Lh; Sun, 25 Aug 2024 09:01:27 +0000 Received: from mail-pf1-x432.google.com ([2607:f8b0:4864:20::432]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1si94U-000000040hr-0EgT for linux-arm-kernel@lists.infradead.org; Sun, 25 Aug 2024 08:58:04 +0000 Received: by mail-pf1-x432.google.com with SMTP id d2e1a72fcca58-7141feed424so2819854b3a.2 for ; Sun, 25 Aug 2024 01:58:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724576280; x=1725181080; 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=UmISYgMpUlAe9Yh2xMwNMd95DBbU9NeKqHPqX7UpJnU=; b=OK/8lczcUzK+DrXkUcfM75SacF/N5QHPh8wqkzAUh2yaDTrSUC8/OWuiDGMRReumGo JxNxPWTDRheet0XuyQPo1Vh4uRCxFZkA1It7lmxN72xf409SQ6eX769ITa9B/YPRncTz bE+9INA/YcVM3BBcbirAfFq+QyMDA+ha2GJnKlfKGw8gywzdUJ2EAVn7Yv7pg4OcC3dC p0lkP5fxE5BJF1kAZiP3JjBcpRl++HOjmVsGkXpMVY8ZTAGkkdntuAvmVtZX960OKDu7 pqQfqEJi2jMLMBtsRyZpiEnnwUA9Vhp5IxhsbUDxEuLXodrKq+CBClS51Ezgn0U1IAa4 px9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724576280; x=1725181080; 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=UmISYgMpUlAe9Yh2xMwNMd95DBbU9NeKqHPqX7UpJnU=; b=RL93+r/l8Z69FsTStkllcQFw9r1+R/GpFHeju9mKnqcSGMH4NecwCszGnYS9ZGS1Tk O2lEgapQwTKPtDzBPF1YE5KW++bYSV/tFoEQ1axjE/67WxjQVXwgJulB4gOR2QPoVMmL XnXpaeV4W0cIf+KeIcm7WRqkdGTWpx2vPmL5MSfQ0YM5h1AnnlqlSPW5oamzLegOcdWq J/KqnIl++wP3y6u6SQeMs1D9WmIU7skXDOxM+VZIAaKu+Wukaxnn9PbvODuk/7dlBj+v AIzT8tJcw09ydONTyZz82hNVG3MWtIGgrNIs0+6Q1MXsENBLv2S27y1E6E8/en1seRMi TWVQ== X-Forwarded-Encrypted: i=1; AJvYcCVhF5NWOJWcP7qE8SXPN2dktvt93UR2+A+Ng23SVBcp+24hSnA4yqdqiH4Pcz8CYiOZMcnoWR1iLB8ZDPjJ3zhW@lists.infradead.org X-Gm-Message-State: AOJu0YzFvF8va3WhHdO5v+jC4YdKmfDo3wZS0jWHqt/+T78H+hrZ6G7q 435cTU4zb/Q1aF8AnCXZpzQ1ggLZdNbv3RXHKfOdJ/aUsTeqbMY8 X-Google-Smtp-Source: AGHT+IFgyeQwAMTLWK0lo4575kKeDSrTrlhwS/4NLcWiLXb0PV0PIYonF6/gE+NONh44UsvI2HFn/g== X-Received: by 2002:a05:6a00:a17:b0:714:21cb:8486 with SMTP id d2e1a72fcca58-71445cd5eb7mr7504708b3a.3.1724576279792; Sun, 25 Aug 2024 01:57:59 -0700 (PDT) Received: from kousik.local ([2405:201:c006:3236:b871:d8f1:d936:dc0c]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7143425109asm5414348b3a.67.2024.08.25.01.57.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Aug 2024 01:57:59 -0700 (PDT) From: Kousik Sanagavarapu To: Nishanth Menon , Jonathan Cameron , Santosh Shilimkar , Nathan Chancellor , Julia Lawall Cc: Shuah Khan , Javier Carrasco , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Kousik Sanagavarapu Subject: [PATCH v4 4/4] soc: ti: pm33xx: do device_node auto cleanup Date: Sun, 25 Aug 2024 14:18:45 +0530 Message-ID: <20240825085714.10736-5-five231003@gmail.com> X-Mailer: git-send-email 2.46.0.290.g4f02c709e8.dirty In-Reply-To: <20240825085714.10736-1-five231003@gmail.com> References: <20240825085714.10736-1-five231003@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240825_015802_132512_38DBB4C6 X-CRM114-Status: GOOD ( 13.56 ) 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 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 | 52 +++++++++++++++++------------------------ 1 file changed, 21 insertions(+), 31 deletions(-) diff --git a/drivers/soc/ti/pm33xx.c b/drivers/soc/ti/pm33xx.c index 3a56bbf3268a..8169885ab1e0 100644 --- a/drivers/soc/ti/pm33xx.c +++ b/drivers/soc/ti/pm33xx.c @@ -383,54 +383,44 @@ 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) { - dev_err(pm33xx_dev, "PM: %s: Unable to find device node for mpu\n", - __func__); - return -ENODEV; - } + if (!np) + return dev_err_probe(pm33xx_dev, -ENODEV, + "PM: %s: Unable to find device node for mpu\n", + __func__); } sram_pool = of_gen_pool_get(np, "pm-sram", 0); - if (!sram_pool) { - dev_err(pm33xx_dev, "PM: %s: Unable to get sram pool for ocmcram\n", - __func__); - ret = -ENODEV; - goto mpu_put_node; - } + if (!sram_pool) + return dev_err_probe(pm33xx_dev, -ENODEV, + "PM: %s: Unable to get sram pool for ocmcram\n", + __func__); 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; - } + if (!sram_pool_data) + return dev_err_probe(pm33xx_dev, -ENODEV, + "PM: %s: Unable to get sram data pool for ocmcram\n", + __func__); 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; - } + if (!ocmcram_location) + return dev_err_probe(pm33xx_dev, -ENOMEM, + "PM: %s: Unable to allocate memory from ocmcram\n", + __func__); ocmcram_location_data = gen_pool_alloc(sram_pool_data, sizeof(struct emif_regs_amx3)); 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 dev_err_probe(pm33xx_dev, -ENOMEM, + "PM: Unable to allocate memory from ocmcram\n"); } -mpu_put_node: - of_node_put(np); - return ret; + return 0; } static int am33xx_pm_rtc_setup(void)