From nobody Sat Feb 7 20:38:36 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