From nobody Sat Feb 7 20:39:48 2026 Received: from mail-pg1-f181.google.com (mail-pg1-f181.google.com [209.85.215.181]) (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 9281A45025 for ; Wed, 3 Jul 2024 06:58:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719989892; cv=none; b=nD+djapCJgyzpd62ykGBZ3k6dJmRQHLJIbTHaJ+CQpTHg4mGvJWNTkzWWXYwCshhN+zaAeeZXkC9P9v1D8DItAMa5SIS99IQTVUQWue00uJMuqoUXcUNCwRzEQ/UwCJGqSYF9CgBZ7X8HKUHnaL2B4R8GADnYWnQv7DsNb32q5g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719989892; c=relaxed/simple; bh=Aat+8U0Q3IJAuf5l3+vmrAyh7Zy59LxP/ajakTChWQM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YawFq5CzdWkd2o/zMRw+r2gz3Sp+vpQJslm6BoarBEe/fErOPKPd4j9vubLDagQrol9QYexffDZhgRuLv1EYrjYzE4hFBajzcD2hmNVDxGT7bMcpmzlcMrxE+VegQqYjuDND46Th8o8SAgeaoo3ZUlVuuEJHu7licC02VPIv0Cs= 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=PVEO/jz9; arc=none smtp.client-ip=209.85.215.181 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="PVEO/jz9" Received: by mail-pg1-f181.google.com with SMTP id 41be03b00d2f7-7449fbfeb6bso2057167a12.2 for ; Tue, 02 Jul 2024 23:58:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719989890; x=1720594690; 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=g5IB8/nq6DlwhVNyviTWwBZ2x7h3P9W/CW2Qn6PLl7I=; b=PVEO/jz96KjYk3ECqRk8aBFVUi2apJupGsI/KoyBIloqKDS+zdAJzvETVs7ajy85Tl zlFVXdscjzYGWhkNT5wL1eMit+QeFJ1oankhYXzDrIy+09Fc1XiQJG6az27C14WxWhLd mHEJ+am5z/ianU3BMQWwfi5HR6k62IOB4z/zAMsdtABtVbB7KeRkbg46ZqAuONHIIact oZfESiJJ3DRRJ27PI8MvL8QtWKCRetr0j3PTMGapjFOZicjTYUq0arAOW1i/jlSh7gNj R0Ikff1qLz8H2/N7fhBdedxoZacsWMll6/9BdIw48zQyeFEGoC/Htc/oU7+cThQ9e4h8 JUQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719989890; x=1720594690; 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=g5IB8/nq6DlwhVNyviTWwBZ2x7h3P9W/CW2Qn6PLl7I=; b=X6OqgvUeWQ6UMv3auQb3WJ7CAR+0CKhgZKLs+WWlkB0uyAynStb8UOKN4zmR7nzuLG 8n0k92ro+ykFqlJjulD6HHcPAbWgqOssr0SrJd8+DPscS1h1/B/lpE5xFStVlZbZTG+F n+SzF3fjdpaCeePtCm4XeVlkbZKM9gM6mkvOg/66K8Y6mr7hrBVJV+iritbHYPqdrKXQ urcJsjTjNrvYFgQh3o4E0kMJdqIQ1vjnoaJVWtoDtFtqdj78Qb6GtdGvMbSoReG/59le FFdNpWTqO+JClk5YSZX7LrjcNbtHtp1EOz5hI58/EZbaPpy3AfbdWZWUlSO9NwATn4Vl BOJw== X-Forwarded-Encrypted: i=1; AJvYcCXUVhzOJU/uFdOEFxjfeRacrBfI+UQHQ45A+YEX3XgN8ygVloBSUPrvDh6Nr4Ue7DhMxAr5S23MH4oO/ma06ePXDXQJXDxiwvyxBL05 X-Gm-Message-State: AOJu0YznpKbvH6nvfEKhhh7ROi2yao8QO0kZ9pvxWb/r28V8FhhpVIkU PkpVCNV/hhHwkNXqjfue39+fcG1QTEnLA04248sZm6NA2Wg5SV73 X-Google-Smtp-Source: AGHT+IEY3rUCcx/kslsTq7Tjv7pevyUVOb+O1uxfTVwJ9nsCAKEHnyQPyUnwCmSJchrtKSBAnmdQ0A== X-Received: by 2002:a05:6a20:244c:b0:1be:c5c8:d1e2 with SMTP id adf61e73a8af0-1bef6198ccamr12807732637.35.1719989889627; Tue, 02 Jul 2024 23:58:09 -0700 (PDT) Received: from kousik.local ([2405:201:c006:312d:258c:c06c:76e7:dba9]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2c91d3e818asm9973921a91.51.2024.07.02.23.58.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jul 2024 23:58:09 -0700 (PDT) From: Kousik Sanagavarapu To: Julia Lawall , Nishanth Menon , Jonathan Cameron , Santosh Shilimkar , Nathan Chancellor Cc: Shuah Khan , Javier Carrasco , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Kousik Sanagavarapu Subject: [PATCH v2 1/3] soc: ti: pruss: do device_node auto cleanup Date: Wed, 3 Jul 2024 12:25:26 +0530 Message-ID: <20240703065710.13786-2-five231003@gmail.com> X-Mailer: git-send-email 2.45.2.561.g66ac6e4bcd In-Reply-To: <20240703065710.13786-1-five231003@gmail.com> References: <20240703065710.13786-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 at various places. While at it, refactor the setup code for device node "memories", from pruss_probe() into a new function pruss_of_setup_memories(). It is worth noticing that this step is a direct consequence of trying to minimize the scope of the "struct device_node" pointer to make auto cleanup read more cleanly. Suggested-by: Julia Lawall Signed-off-by: Kousik Sanagavarapu --- drivers/soc/ti/pruss.c | 168 +++++++++++++++++++---------------------- 1 file changed, 78 insertions(+), 90 deletions(-) diff --git a/drivers/soc/ti/pruss.c b/drivers/soc/ti/pruss.c index 24a42e0b645c..9767d129a8ea 100644 --- a/drivers/soc/ti/pruss.c +++ b/drivers/soc/ti/pruss.c @@ -381,38 +381,82 @@ static int pruss_clk_mux_setup(struct pruss *pruss, s= truct clk *clk_mux, static int pruss_clk_init(struct pruss *pruss, struct device_node *cfg_nod= e) { const struct pruss_private_data *data; - struct device_node *clks_np; struct device *dev =3D pruss->dev; int ret =3D 0; =20 data =3D of_device_get_match_data(dev); =20 - clks_np =3D of_get_child_by_name(cfg_node, "clocks"); - if (!clks_np) { - dev_err(dev, "%pOF is missing its 'clocks' node\n", cfg_node); - return -ENODEV; - } + struct device_node *clks_np __free(device_node) =3D + of_get_child_by_name(cfg_node, "clocks"); + if (!clks_np) + return dev_err_probe(dev, -ENODEV, + "%pOF is missing its 'clocks' node\n", cfg_node); =20 if (data && data->has_core_mux_clock) { ret =3D pruss_clk_mux_setup(pruss, pruss->core_clk_mux, "coreclk-mux", clks_np); - if (ret) { - dev_err(dev, "failed to setup coreclk-mux\n"); - goto put_clks_node; - } + if (ret) + return dev_err_probe(dev, ret, + "failed to setup coreclk-mux\n"); } =20 ret =3D pruss_clk_mux_setup(pruss, pruss->iep_clk_mux, "iepclk-mux", clks_np); - if (ret) { - dev_err(dev, "failed to setup iepclk-mux\n"); - goto put_clks_node; - } + if (ret) + return dev_err_probe(dev, ret, "failed to setup iepclk-mux\n"); =20 -put_clks_node: - of_node_put(clks_np); + return 0; +} =20 - return ret; +static int pruss_of_setup_memories(struct device *dev, struct pruss *pruss) +{ + struct device_node *np =3D dev_of_node(dev); + struct device_node *child __free(device_node) =3D + of_get_child_by_name(np, "memories"); + int i; + + if (!child) + return dev_err_probe(dev, -ENODEV, + "%pOF is missing its 'memories' node\n", + child); + + for (i =3D 0; i < PRUSS_MEM_MAX; i++) { + const struct pruss_private_data *data =3D + of_device_get_match_data(dev); + const char *mem_names[PRUSS_MEM_MAX] =3D + { "dram0", "dram1", "shrdram2" }; + struct resource res; + int index; + + /* + * On AM437x one of two PRUSS units don't contain Shared RAM, + * skip it + */ + if (data && data->has_no_sharedram && i =3D=3D PRUSS_MEM_SHRD_RAM2) + continue; + + index =3D of_property_match_string(child, "reg-names", + mem_names[i]); + if (index < 0) + return index; + + if (of_address_to_resource(child, index, &res)) + return -EINVAL; + + pruss->mem_regions[i].va =3D devm_ioremap(dev, res.start, + resource_size(&res)); + if (!pruss->mem_regions[i].va) + return dev_err_probe(dev, -ENOMEM, + "failed to parse and map memory resource %d %s\n", + i, mem_names[i]); + pruss->mem_regions[i].pa =3D res.start; + pruss->mem_regions[i].size =3D resource_size(&res); + + dev_dbg(dev, "memory %8s: pa %pa size 0x%zx va %pK\n", + mem_names[i], &pruss->mem_regions[i].pa, + pruss->mem_regions[i].size, pruss->mem_regions[i].va); + } + return 0; } =20 static struct regmap_config regmap_conf =3D { @@ -424,26 +468,21 @@ static struct regmap_config regmap_conf =3D { static int pruss_cfg_of_init(struct device *dev, struct pruss *pruss) { struct device_node *np =3D dev_of_node(dev); - struct device_node *child; + struct device_node *child __free(device_node) =3D + of_get_child_by_name(np, "cfg"); struct resource res; int ret; =20 - child =3D of_get_child_by_name(np, "cfg"); - if (!child) { - dev_err(dev, "%pOF is missing its 'cfg' node\n", child); - return -ENODEV; - } + if (!child) + return dev_err_probe(dev, -ENODEV, + "%pOF is missing its 'cfg' node\n", child); =20 - if (of_address_to_resource(child, 0, &res)) { - ret =3D -ENOMEM; - goto node_put; - } + if (of_address_to_resource(child, 0, &res)) + return -ENOMEM; =20 pruss->cfg_base =3D devm_ioremap(dev, res.start, resource_size(&res)); - if (!pruss->cfg_base) { - ret =3D -ENOMEM; - goto node_put; - } + if (!pruss->cfg_base) + return -ENOMEM; =20 regmap_conf.name =3D kasprintf(GFP_KERNEL, "%pOFn@%llx", child, (u64)res.start); @@ -452,34 +491,22 @@ static int pruss_cfg_of_init(struct device *dev, stru= ct pruss *pruss) pruss->cfg_regmap =3D devm_regmap_init_mmio(dev, pruss->cfg_base, ®map_conf); kfree(regmap_conf.name); - if (IS_ERR(pruss->cfg_regmap)) { - dev_err(dev, "regmap_init_mmio failed for cfg, ret =3D %ld\n", - PTR_ERR(pruss->cfg_regmap)); - ret =3D PTR_ERR(pruss->cfg_regmap); - goto node_put; - } + if (IS_ERR(pruss->cfg_regmap)) + return dev_err_probe(dev, PTR_ERR(pruss->cfg_regmap), + "regmap_init_mmio failed for cfg\n"); =20 ret =3D pruss_clk_init(pruss, child); if (ret) - dev_err(dev, "pruss_clk_init failed, ret =3D %d\n", ret); + return dev_err_probe(dev, ret, "pruss_clk_init failed\n"); =20 -node_put: - of_node_put(child); return ret; } =20 static int pruss_probe(struct platform_device *pdev) { struct device *dev =3D &pdev->dev; - struct device_node *np =3D dev_of_node(dev); - struct device_node *child; struct pruss *pruss; - struct resource res; - int ret, i, index; - const struct pruss_private_data *data; - const char *mem_names[PRUSS_MEM_MAX] =3D { "dram0", "dram1", "shrdram2" }; - - data =3D of_device_get_match_data(&pdev->dev); + int ret; =20 ret =3D dma_set_coherent_mask(dev, DMA_BIT_MASK(32)); if (ret) { @@ -494,48 +521,9 @@ static int pruss_probe(struct platform_device *pdev) pruss->dev =3D dev; mutex_init(&pruss->lock); =20 - child =3D of_get_child_by_name(np, "memories"); - if (!child) { - dev_err(dev, "%pOF is missing its 'memories' node\n", child); - return -ENODEV; - } - - for (i =3D 0; i < PRUSS_MEM_MAX; i++) { - /* - * On AM437x one of two PRUSS units don't contain Shared RAM, - * skip it - */ - if (data && data->has_no_sharedram && i =3D=3D PRUSS_MEM_SHRD_RAM2) - continue; - - index =3D of_property_match_string(child, "reg-names", - mem_names[i]); - if (index < 0) { - of_node_put(child); - return index; - } - - if (of_address_to_resource(child, index, &res)) { - of_node_put(child); - return -EINVAL; - } - - pruss->mem_regions[i].va =3D devm_ioremap(dev, res.start, - resource_size(&res)); - if (!pruss->mem_regions[i].va) { - dev_err(dev, "failed to parse and map memory resource %d %s\n", - i, mem_names[i]); - of_node_put(child); - return -ENOMEM; - } - pruss->mem_regions[i].pa =3D res.start; - pruss->mem_regions[i].size =3D resource_size(&res); - - dev_dbg(dev, "memory %8s: pa %pa size 0x%zx va %pK\n", - mem_names[i], &pruss->mem_regions[i].pa, - pruss->mem_regions[i].size, pruss->mem_regions[i].va); - } - of_node_put(child); + ret =3D pruss_of_setup_memories(dev, pruss); + if (ret < 0) + goto rpm_put; =20 platform_set_drvdata(pdev, pruss); =20 --=20 2.45.2.561.g66ac6e4bcd From nobody Sat Feb 7 20:39:48 2026 Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) (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 22446134415 for ; Wed, 3 Jul 2024 06:58:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719989897; cv=none; b=V4aFEbJnSBoEYTjcXIh/B7PIxXOPl7iXXF4hPmsCfiGITwWSdWn/9Bwh9EZFAUVSU5cgV68/aGgCFlDK5QoIbvdkIY62cHp7w7KBNYxFkmX5LJtzOzfOoSYkE7yEN+E81FnB0LvYSy7hkejvXBk1Pk0Q9T5+aI4An9PUq0EKAO0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719989897; c=relaxed/simple; bh=ZPs014jUeapXXCgzHtG44Q1FaQuSO5JnIUvqtly4tiY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YGAhV64yKsq0MzRI6t0dhS4wFJpIOFRg3OR2xsnYUwbX79Jnp1aNnu2NPUzZ9yZJ3WKG6tzeREQYPg7njESbv57NT1yMO50rH5AaQOzNuDENweOaGDcwS6a4TKxab/ZnhwdzsHOKFBSzNAgETtmkDqnuFVi7VHf06JuRSS3l2QU= 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=AkGCrcyk; arc=none smtp.client-ip=209.85.216.41 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="AkGCrcyk" Received: by mail-pj1-f41.google.com with SMTP id 98e67ed59e1d1-2c8911c84daso3468505a91.3 for ; Tue, 02 Jul 2024 23:58:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719989895; x=1720594695; 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=xzpdtG7l+61FZknCaY59u/tBtOIKZgOnyqq0sEG7wfc=; b=AkGCrcykJlhpDOHQK+VLb2YXoUJBsrzcomXV5EgmOsWU4cWVVGPfd2OpGjDsb2ezoC 542jInNrf2mmEVxkiImLuf6n9bvtu5Wqu/THJIFH8Eo5iCsuhv+gUcERcjyQ5wzDIS9m wS3Mx6OCQwPv0VLzxeYRWvHs5J8SdbtENkRCNPdKz/F0WILa13tj8GD2SXRG1An1PKtc Wr6GI61T3dGK0TybEE1kkFYZCi0H36+sWUcylsf/I1B0FPnnzPJKaaaW5eT+gzB+c3o1 cgHqjTwDMa55cNiQT58nbzu/o+fY6EQFbaBQHJq1O5vxZuZB1wAc4OHTG6usmUTv2gZi LGEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719989895; x=1720594695; 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=xzpdtG7l+61FZknCaY59u/tBtOIKZgOnyqq0sEG7wfc=; b=dDwyy+ppsYDIYfid1Ww3bCSi4PZX18cGjEnNWNB8FeGzIwCqTUvrWbmyltcOq47O5G rdn7rz2lsAoIjO+0tgwOWrkD4KxraQzHfkQTH/XO4FMhCDg7IPhOws8FaVpRHLmWuNWF 6TZzLXFyy8f3PwgDm8GDMgp3DF7Cu9XvbVF4IwlpjONZXCjl75uZVrU06jH3iKxtS+XJ bIYtDwJPPtcVlaatAbQVjDe2QEfS6o+5hLDaUhP3/peyJJAzPKG8Q+QlG6O3bv+L4j7X lx8xyn/rU2Elep9Nm9VV7V4x+oy5uVMIaOYbq6dLJC3RmMetQxCFWdg5hoUqRohEavCU 7PbQ== X-Forwarded-Encrypted: i=1; AJvYcCWMQa7JMsBkbR1PQEQZnKj0jTXCy628GHE8vlS1xiYJNXNa/5l4G7JMlRHmmiBMepKKR2l9LwFgDEY0lvWSD6rjFBpLdEL3V2hsJMjm X-Gm-Message-State: AOJu0Yw3G2lf62ipmzy/DbzBjYGN8ML7t1E1xpFshYfXL4ZRx/0zFq41 sEGMEDcUjw+IbDJ2WoffpNWoldX9Y9EXeC+STHXq+MAoALdkJzJg X-Google-Smtp-Source: AGHT+IFhTTaB1WupIMW6rfPpx8ReG1qfczZ5DxmoQdwGtfpjx5/6cHxOC3KlaEaxTWQ5ki3CPJyZXg== X-Received: by 2002:a17:90b:3a8b:b0:2c8:6308:ad78 with SMTP id 98e67ed59e1d1-2c93d7694abmr10642022a91.34.1719989895182; Tue, 02 Jul 2024 23:58:15 -0700 (PDT) Received: from kousik.local ([2405:201:c006:312d:258c:c06c:76e7:dba9]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2c91d3e818asm9973921a91.51.2024.07.02.23.58.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jul 2024 23:58:14 -0700 (PDT) From: Kousik Sanagavarapu To: Julia Lawall , Nishanth Menon , Jonathan Cameron , Santosh Shilimkar , Nathan Chancellor Cc: Shuah Khan , Javier Carrasco , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Kousik Sanagavarapu Subject: [PATCH v2 2/3] soc: ti: knav_qmss_queue: do device_node auto cleanup Date: Wed, 3 Jul 2024 12:25:27 +0530 Message-ID: <20240703065710.13786-3-five231003@gmail.com> X-Mailer: git-send-email 2.45.2.561.g66ac6e4bcd In-Reply-To: <20240703065710.13786-1-five231003@gmail.com> References: <20240703065710.13786-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, which automatically free()s "struct device_node". While at it, refactor the code from knav_queue_probe() into the seperate functions to make auto cleanup look more neat. Doing the cleanup this way has the advantage of reducing the chance of memory leaks in case we need to read from new OF nodes in the future when we probe. Suggested-by: Julia Lawall Signed-off-by: Kousik Sanagavarapu Reviewed-by: Jonathan Cameron --- drivers/soc/ti/knav_qmss_queue.c | 85 +++++++++++++++++--------------- 1 file changed, 46 insertions(+), 39 deletions(-) diff --git a/drivers/soc/ti/knav_qmss_queue.c b/drivers/soc/ti/knav_qmss_qu= eue.c index 06fb5505c22c..767b9c49ea93 100644 --- a/drivers/soc/ti/knav_qmss_queue.c +++ b/drivers/soc/ti/knav_qmss_queue.c @@ -1076,14 +1076,20 @@ static const char *knav_queue_find_name(struct devi= ce_node *node) } =20 static int knav_queue_setup_regions(struct knav_device *kdev, - struct device_node *regions) + struct device_node *node) { struct device *dev =3D kdev->dev; + struct device_node *regions __free(device_node) =3D + of_get_child_by_name(node, "descriptor-regions"); struct knav_region *region; struct device_node *child; u32 temp[2]; int ret; =20 + if (!regions) + return dev_err_probe(dev, -ENODEV, + "descriptor-regions not specified\n"); + for_each_child_of_node(regions, child) { region =3D devm_kzalloc(dev, sizeof(*region), GFP_KERNEL); if (!region) { @@ -1306,10 +1312,16 @@ static int knav_setup_queue_range(struct knav_devic= e *kdev, } =20 static int knav_setup_queue_pools(struct knav_device *kdev, - struct device_node *queue_pools) + struct device_node *node) { + struct device_node *queue_pools __free(device_node) =3D + of_get_child_by_name(node, "queue-pools"); struct device_node *type, *range; =20 + if (!queue_pools) + return dev_err_probe(kdev->dev, -ENODEV, + "queue-pools not specified\n"); + for_each_child_of_node(queue_pools, type) { for_each_child_of_node(type, range) { /* return value ignored, we init the rest... */ @@ -1389,14 +1401,20 @@ static void __iomem *knav_queue_map_reg(struct knav= _device *kdev, } =20 static int knav_queue_init_qmgrs(struct knav_device *kdev, - struct device_node *qmgrs) + struct device_node *node) { struct device *dev =3D kdev->dev; + struct device_node *qmgrs __free(device_node) =3D + of_get_child_by_name(node, "qmgrs"); struct knav_qmgr_info *qmgr; struct device_node *child; u32 temp[2]; int ret; =20 + if (!qmgrs) + return dev_err_probe(dev, -ENODEV, + "queue manager info not specified\n"); + for_each_child_of_node(qmgrs, child) { qmgr =3D devm_kzalloc(dev, sizeof(*qmgr), GFP_KERNEL); if (!qmgr) { @@ -1668,6 +1686,25 @@ static int knav_queue_start_pdsps(struct knav_device= *kdev) return 0; } =20 +static int knav_queue_setup_pdsps(struct knav_device *kdev, + struct device_node *node) +{ + struct device_node *pdsps __free(device_node) =3D + of_get_child_by_name(node, "pdsps"); + + if (pdsps) { + int ret; + + ret =3D knav_queue_init_pdsps(kdev, pdsps); + if (ret) + return ret; + ret =3D knav_queue_start_pdsps(kdev); + if (ret) + return ret; + } + return 0; +} + static inline struct knav_qmgr_info *knav_find_qmgr(unsigned id) { struct knav_qmgr_info *qmgr; @@ -1755,7 +1792,6 @@ MODULE_DEVICE_TABLE(of, keystone_qmss_of_match); static int knav_queue_probe(struct platform_device *pdev) { struct device_node *node =3D pdev->dev.of_node; - struct device_node *qmgrs, *queue_pools, *regions, *pdsps; struct device *dev =3D &pdev->dev; u32 temp[2]; int ret; @@ -1799,39 +1835,17 @@ static int knav_queue_probe(struct platform_device = *pdev) kdev->num_queues =3D temp[1]; =20 /* Initialize queue managers using device tree configuration */ - qmgrs =3D of_get_child_by_name(node, "qmgrs"); - if (!qmgrs) { - dev_err(dev, "queue manager info not specified\n"); - ret =3D -ENODEV; - goto err; - } - ret =3D knav_queue_init_qmgrs(kdev, qmgrs); - of_node_put(qmgrs); + ret =3D knav_queue_init_qmgrs(kdev, node); if (ret) goto err; =20 /* get pdsp configuration values from device tree */ - pdsps =3D of_get_child_by_name(node, "pdsps"); - if (pdsps) { - ret =3D knav_queue_init_pdsps(kdev, pdsps); - if (ret) - goto err; - - ret =3D knav_queue_start_pdsps(kdev); - if (ret) - goto err; - } - of_node_put(pdsps); + ret =3D knav_queue_setup_pdsps(kdev, node); + if (ret) + goto err; =20 /* get usable queue range values from device tree */ - queue_pools =3D of_get_child_by_name(node, "queue-pools"); - if (!queue_pools) { - dev_err(dev, "queue-pools not specified\n"); - ret =3D -ENODEV; - goto err; - } - ret =3D knav_setup_queue_pools(kdev, queue_pools); - of_node_put(queue_pools); + ret =3D knav_setup_queue_pools(kdev, node); if (ret) goto err; =20 @@ -1853,14 +1867,7 @@ static int knav_queue_probe(struct platform_device *= pdev) if (ret) goto err; =20 - regions =3D of_get_child_by_name(node, "descriptor-regions"); - if (!regions) { - dev_err(dev, "descriptor-regions not specified\n"); - ret =3D -ENODEV; - goto err; - } - ret =3D knav_queue_setup_regions(kdev, regions); - of_node_put(regions); + ret =3D knav_queue_setup_regions(kdev, node); if (ret) goto err; =20 --=20 2.45.2.561.g66ac6e4bcd From nobody Sat Feb 7 20:39:48 2026 Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) (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 57214137760 for ; Wed, 3 Jul 2024 06:58:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719989902; cv=none; b=NVe75Wk5FJvUmJH+4zSJO0rWqDoygDCOod2YK5pldrLo0eB4BySLqQuKfz69hMrk4q7ZqoQAT1Cjh9YZDSs9nxOj+cBgoY3zXtcDfP7ZybcLR6kkgr7f0xUDjVJefuD+hDLnd/jDbHxk7TUpIIGHaJteHmyDLy5qJTvjFzOFZhw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719989902; c=relaxed/simple; bh=o2uBgu6KoI6iC4vRl+T9bSlBLBAmmXqPYZ7yreC4cEY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fRoDeUXsM8Ssc5+DQEGB12UAwE+KVWINKy29vXnhfO/+sevOGkkfI0h46f0ESO/eVckxporVU6rBtLXMtE0w71Ladqpfo/baC34ctI8+c3/CslJlbMnFGCUEAiRI2EuuYN6jXGYqKnB0wKcUy/zTzeudgdTWyS1VrvCxAG13BBg= 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=YSl/XEM5; arc=none smtp.client-ip=209.85.216.54 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="YSl/XEM5" Received: by mail-pj1-f54.google.com with SMTP id 98e67ed59e1d1-2c8911c84daso3468542a91.3 for ; Tue, 02 Jul 2024 23:58:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719989901; x=1720594701; 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=bxbxKt+yrBPNNKQZqw0DOsM2FX9GJEjPe3EATpJa3RU=; b=YSl/XEM5jROWO724p4De+dkUqr2O7CWc4oWZivF4HzzN/+fKk9tbqEsQHDOi3IPHCH wXmb+2hOcrdW8TUqmcrc0C/DKY7yPugI4JznCAxGzXXM1OSoc9riquduNTYiJzvK7f+/ wKvGzWXEzB0xzJTLus9pPqqxuNBEwuS6BPnhb426tAGIpa/PbrYUUwXqhyIfSCwaIHhR cRPC2HxzOHzj+YIus1eRajqy2Mvdw79zrBL86RK211PWbaJtqQ9SVcWpPe//s8ajiGL+ nlzxud2BoAciozenOXX6bjzLK9L+gX18J8wET0YwPvYXpnk7sWgU7MYUGouZZ9KaHa9t /xAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719989901; x=1720594701; 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=bxbxKt+yrBPNNKQZqw0DOsM2FX9GJEjPe3EATpJa3RU=; b=EG9cT6JHbX0861ZZ4CQa7Y6MBx3gUP2ImrgHCbRpji4YYR22n8Z5CrH+JJh7Zwx2tt 4NC4e7Ze3DtEbtHPLcuvwbbee5MdtYaCjy4xeIL36BqPYiEeawvHiXwZ9NIiISf4bfyN 86cYoDattFCLSwuCmYKUVj437HMLkKd9uqo9wpfEw8xO2dq2LrxRF1gs+ew+/mV1DN03 b7FZuomy0QLUZuVoGTGlvphUB53gB/LDouVz1PCjq2zyY7SpztXoxrOg3X00SRREtOKg jThQoSxnEhkVJXpbKyuBf1uhQR0HiOhLTv02CXCPKWln0sNrXr1yT9yYR0Zi9ogVtNG0 Dy+Q== X-Forwarded-Encrypted: i=1; AJvYcCX7vcsB1PvXacxyHj9CRE2knSP/ik+0Ik1ocYUbjdH4plH1Tu8UvHsCAaUE71oZmD47BGSdTMKeHBqI7HcU+9+xBcHy/hgIKL7oZM2w X-Gm-Message-State: AOJu0YxelKXar4/UUJ5orX3z8WuPqoSor9ojXEUO4Jr9ePp6Dgu59FC8 4hw76Kh/5hBGAgtyl+mL+i5TOnXswDCXVPXRyi8dtSKatMZ/Afjy X-Google-Smtp-Source: AGHT+IHArs7mizExpBu5sv5B/RYD+ZEGUNrrOWSx56Hcy+SLKwJ5Kja6sljlxOWMSAWYm+qthagh5g== X-Received: by 2002:a17:90a:ec12:b0:2c8:880:776b with SMTP id 98e67ed59e1d1-2c93d71f509mr9257040a91.23.1719989900562; Tue, 02 Jul 2024 23:58:20 -0700 (PDT) Received: from kousik.local ([2405:201:c006:312d:258c:c06c:76e7:dba9]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2c91d3e818asm9973921a91.51.2024.07.02.23.58.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jul 2024 23:58:20 -0700 (PDT) From: Kousik Sanagavarapu To: Julia Lawall , Nishanth Menon , Jonathan Cameron , Santosh Shilimkar , Nathan Chancellor Cc: Shuah Khan , Javier Carrasco , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Kousik Sanagavarapu Subject: [PATCH v2 3/3] soc: ti: pm33xx: do device_node auto cleanup Date: Wed, 3 Jul 2024 12:25:28 +0530 Message-ID: <20240703065710.13786-4-five231003@gmail.com> X-Mailer: git-send-email 2.45.2.561.g66ac6e4bcd In-Reply-To: <20240703065710.13786-1-five231003@gmail.com> References: <20240703065710.13786-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 | 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 =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) { @@ -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 =3D -ENODEV; - goto mpu_put_node; + return -ENODEV; } =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; + return -ENODEV; } =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; + return -ENOMEM; } =20 ocmcram_location_data =3D 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 =3D -ENOMEM; + return -ENOMEM; } =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