From patchwork Sun Jul 7 05:14:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kousik Sanagavarapu X-Patchwork-Id: 13725972 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 1A9C6C3814E for ; Sun, 7 Jul 2024 05:55:11 +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=oUg4PV29CFOGLmMvmdWs76G4kY/lh/K0XHciozPPEOE=; b=fGI0YefHg97wWznOqjdZBxq8as iZEY2S2dMYO2zkQH3RztWZxuwkCpAJRS3keeKjRSLGRQVj6YWF+YicPnv0wZ7OgpkS9g+APJa50H1 oBqYG49Nlk6OxVCZ0ez16oj90Y6au8YAzC0Wwm8IrcLcwFo9TKMpqjeanCdAZsL7/Tcwc+dc3f9tF HAr2g3zeUc04Sbd1/8CeBdm0suF8PaQOL8zxBUrIZT94XETvCVNIPnMDXrwhbhjx7a/K1C8xzLNWf IvqQoG7pcZ5DBWlmQxYTA5EdEv8t/OC2AKGDJODDFlHy7LCGBxpeWdzp9oYhYBWlaXEwSBFw7uQbV jpSHis5g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sQKrX-00000001ORB-3z7d; Sun, 07 Jul 2024 05:55:03 +0000 Received: from mail-oi1-x232.google.com ([2607:f8b0:4864:20::232]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sQKqu-00000001OAC-0vWE for linux-arm-kernel@lists.infradead.org; Sun, 07 Jul 2024 05:54:25 +0000 Received: by mail-oi1-x232.google.com with SMTP id 5614622812f47-3d92c13a2fbso145484b6e.0 for ; Sat, 06 Jul 2024 22:54:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720331663; x=1720936463; 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=oUg4PV29CFOGLmMvmdWs76G4kY/lh/K0XHciozPPEOE=; b=O/zbF4ATwRB8UZAUlI6N+WkQNJTIT2kQ89ADpz6h7YIbS6LMGMt/gP8SBT1ihOCM5d DS+ERm4go3/ke/Nsl6hR1tbDgl1J1MIdqD2xCXN3pPrag3o5PMUbM4RiaBQYn6S0PUC0 HwWL8e0Sbp70+jCrz+ak1qWSKeBw+W27wu4XFEFrnvHmfGWVZ77vaMXwcjvT1/pZPvjY zUuuGjIfPOh8iE+2R2HFNDD8yGukSg2je+DZx5981j0accLNtDctpttq+R1ZCufxt3iU kWaQgjkcy3JtxLDMBKoeOC9Za9Ck7IGWNqfoORqKO2SMkV44yRL58YoUAgGwebru/qeJ w4sA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720331663; x=1720936463; 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=oUg4PV29CFOGLmMvmdWs76G4kY/lh/K0XHciozPPEOE=; b=v8uMyBAPwdoHKBatdjtHwgik48Eu07BmwlURY3T0EKGmrlbaL9Py7m0VrVeG2SYIC9 D8txyN5t4jVGBYycyD52hreYgfchFzkA7PZlYV57eQuXgjMGHnVQTtwDSsCsWyQ9kazg wP/ggaA+Kl/EpB0PpfMwtG+ffiCM8Q7wmGSOnVkCaMfbni8n87+aejiVo9f+v3LIm76Q AXfwweBSqORiZB7IFryNbn7zJ+l87Ur/da6Y0DQNR5AkCwodQyspuJrx2cmBxJfEPshO Mp/NYZKcvaJP0Fpw2pXdgQW1Bk7bT9hHWvyk+DZ2LqCCDWLH0VhWlw2unNDKO74XbDG7 V+qw== X-Forwarded-Encrypted: i=1; AJvYcCVabtiSQQ7Ku0rfrDHpVkDGmcTiZyQ/lon4H9HulGdLZYVLpVCfkNmD7/gaPObb+RJ0VX9tx6iWnF8QlA6r33FC0+Ew33K6qQJ4PYm0MxSZi2GbYI0= X-Gm-Message-State: AOJu0YxjBplC1dVYCNaBzVyNJjkUkeoPEed4oPqx0DqpLmte5Ej97o5Z IVCljNFj9UALJMD7Ui2asKaF3Vs2SdjYzmLQiV/wJzDx6sPey0TJ X-Google-Smtp-Source: AGHT+IFUJJDPOBesbBpJmBoRvVb3Ess8NluFY8+9Qxo64gDShTCPBuINQn3LHw7EIoQS+c8DkpXYLQ== X-Received: by 2002:a05:6808:1392:b0:3d9:1f05:845 with SMTP id 5614622812f47-3d91f050a43mr7087381b6e.19.1720331662674; Sat, 06 Jul 2024 22:54:22 -0700 (PDT) Received: from kousik.local ([2405:201:c006:312d:252d:94b8:b79c:d7bb]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-70b2e5fe3dfsm94429b3a.97.2024.07.06.22.54.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Jul 2024 22:54:22 -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 v3 4/4] soc: ti: pm33xx: do device_node auto cleanup Date: Sun, 7 Jul 2024 10:44:19 +0530 Message-ID: <20240707055341.3656-5-five231003@gmail.com> X-Mailer: git-send-email 2.45.2.561.g66ac6e4bcd In-Reply-To: <20240707055341.3656-1-five231003@gmail.com> References: <20240707055341.3656-1-five231003@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240706_225424_324785_177CF595 X-CRM114-Status: GOOD ( 13.76 ) 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 8e983c3c4e03..d0edce53c793 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)