From nobody Sat Feb 7 15:30:17 2026 Received: from mail-oi1-f174.google.com (mail-oi1-f174.google.com [209.85.167.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A185815EA6 for ; Sun, 7 Jul 2024 05:54:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720331665; cv=none; b=rK0H+nOqSA4hWM5xXO5S5/S19cjJd/U7OJ77LhUxJFtUuFm9qNUUzRo22AAiAjnibkLtG/q9LHpCfDOqM+jjGiVhOJPGd7EJubVin6h3S22pXFcxt4RjEylMzM5jwl4XRyh/FPNOu65M+mBIPhRtCCoG/2A2u8pICIhcPVobAKE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720331665; c=relaxed/simple; bh=A+Yqc0Y2sY3QERD0+cTYtcAee5yJA/eRgm7s+R2BFY8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WqR319DbYSNtdJB60Co9F0ChiQztMeCe9Zh0p8N/o2Hh+QnHtBVvOxZSCwqQm+6JnK/2DWA7JPNQv6yq1LmSN1q4houMGdSBvx4WgByVSzbDCHYN9fOKcXwo/JpXG6E8w62plxmSb7rdFmDYTc5MDhsKO7un3DNSNfWhezH+TwI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=VHqv+qM8; arc=none smtp.client-ip=209.85.167.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="VHqv+qM8" Received: by mail-oi1-f174.google.com with SMTP id 5614622812f47-3c9cc66c649so1525129b6e.1 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=vger.kernel.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=VHqv+qM8T+cRtDJKRy8AicAxbxMelKJNDFTJw62tyzmkdrYqknu9MI2HK0YelX6clu vfqGZ3j7Iz9tPXY4gAxCeQ18YgC/cSfgffchfV+u9XC4jpyik6R2Q57MLtRjvvmqM53D ot0K7QpaRy0qasMuBphzJtZ33/gIv+BZJtEhtnKMOoyrfVARhxuhloZHhLVYiAH4PzTf Y3Oznt24hATjBlgtda6DKASxvwgO46+GPOfqUM44no+10gokz28BykH/vW2pzNugeJeq li1VcFXs1ysdgB/kEPqCGROx1BgwSNvPvk5AZ+pHOGBfeGN4EmF4cMN+qwDIRUn27Kde e7Yw== 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=NnqNJpUVXYqkludzUWNmr8rNtyp8QlvXPEZkpg6yOKrygCcgZgzIOIs4+S0yrKouFH 9VH0EmyGlQoFOgsistkGHXniFZW8iZRVzfovOhXaHWwIYZCdaNMVs94aIw3fTfBgeANv XH7NjvqJwkk6XbRLQoY2gp09SmQ768zoSbHj4OBNef5NPm/rf/WsMay4xDWP8EqnTACT iQEg4bZvp4Zbhwb/RH2+tP2ppLeRZooJBhVguyvHISfk4590edlrPKUf/G1PFjKxi3nr rQQN19MdHxKLzOoZXi4RXebaHLT4twomzB2V8mezA98uWGJV/hj6/Pxprj2H4vCOJkum ffyg== X-Forwarded-Encrypted: i=1; AJvYcCVJvhIK/z3zrAl0BuIkMEspq5p4Y5KC7Cl0jESsW0KQREeDkpc0cpfc7mu0pOaQc7ENIVyY0q1jH/xuo3AC5goCdZKGlENgtNyN/SoR X-Gm-Message-State: AOJu0YxA7qHei2YrgJI98o9SdO2Z4yoP08Jin7ESKokuO9OkbJWmv+LT tzbp8QvtWNTuP2oh+8qVgLdv3gYaVSeYrWPY7qgs/YCo9vy8mJSG 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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 =3D 0; + struct device_node *np __free(device_node) =3D + of_find_compatible_node(NULL, NULL, "ti,omap3-mpu"); =20 - np =3D of_find_compatible_node(NULL, NULL, "ti,omap3-mpu"); if (!np) { np =3D 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__); } =20 sram_pool =3D 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 =3D -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__); =20 sram_pool_data =3D 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 =3D -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__); =20 ocmcram_location =3D 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 =3D -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__); =20 ocmcram_location_data =3D 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 =3D -ENOMEM; + return dev_err_probe(pm33xx_dev, -ENOMEM, + "PM: Unable to allocate memory from ocmcram\n"); } =20 -mpu_put_node: - of_node_put(np); - return ret; + return 0; } =20 static int am33xx_pm_rtc_setup(void) --=20 2.45.2.561.g66ac6e4bcd