From nobody Fri Dec 19 18:00:01 2025 Received: from mail-oo1-f52.google.com (mail-oo1-f52.google.com [209.85.161.52]) (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 61C1177119 for ; Sun, 25 Aug 2024 08:57:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.161.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724576265; cv=none; b=rJ+volB/35zE/SNm/dDptdji8hvZz7N6OGQ0vU0Jwz0BjphxKdGUbTNhVTR7BXTdxYqYionOpfzqAFTra6+WDSAeh2y9kj+jSKnN8xr/3jVw17m5H3oyBRTWpSemgj6+lTPIEfckzTrBW7Cx3arnXqVF/rfuw9gEavYkzpQAlrQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724576265; c=relaxed/simple; bh=67/Xozd18Ej9k8mZ00J+8j3/xv7WWXoGpKJcxBLrG2Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZvGesFNkZDfiGsWmMosygqnJMMDTBi6pUJAnu9QNXyOdG/n/YnLET6rSSwKqkSuJwaQ07MapQZuRn5rt5RzHOiwD1W2Q6pL+E4kkkGMrrEkh3KPNsC7pV0d6bERCXwfSpLgncIFPdJkSlV31G0+kgJhb/8bZLHTuI6zwSKo/cX4= 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=ZKzZ1Lee; arc=none smtp.client-ip=209.85.161.52 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="ZKzZ1Lee" Received: by mail-oo1-f52.google.com with SMTP id 006d021491bc7-5d5e97b8adbso2902022eaf.1 for ; Sun, 25 Aug 2024 01:57:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724576263; x=1725181063; 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=jNMuyrfijznIh50InJIHyOaHM84gPkC0aoCc4qU4CQ4=; b=ZKzZ1Lee9BdGoPcdhW3sXk2UGrsARciML8Kici79KF5DuboffLz7WU6SSy+hN7LzdR +cuWZdb9CPvijv+ugugacXXhFMKPLCV1BjzygyXZ4wu9VQkuWXF7HCkNi32UPlbLDeif RVPTcIxB0mgm5fTYqc8fj3cwzmo+N+cflGRtOA0W3UqpWxJ0B5IGMHKsjsaLw5f//Yvt 13beL90LJLQ6JQHP0r7hJKlOa5jSxDgmZjHiErd6OaJQxUyGtUcqqVCjA54aCOplpOOa xespI5iPQVlbWRyTE5XEVWpLwU6seYNffS0x9G64/76r5KNoG6Tv/UMY3tBuTAOqkuFf Iaiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724576263; x=1725181063; 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=jNMuyrfijznIh50InJIHyOaHM84gPkC0aoCc4qU4CQ4=; b=GtVeQ+//HStjf3Wk4XppxB7na5nVEBFB/EeMeh0Ybiq6AGsrnHwcoKFMDvBGKM3VXU b1kk/VEJli6cccfmUdCV3whjeohUua4qLNLgS4Z9NjHPJQdRXWCzNNSw5g05ZwElgRm/ iH78oZLNnjzSp6QJRih82TtM6lh1S7z1BUCquwGl6uRkWgfgELRPN98buRZTZb4nx3sV dNOmHD4hSJGau2Zr75YRY1vLnLCbEIKIZoMdbupbB8QmY3YYB6PAhMc48I4CqdQx8FLT uq9jIziqLobQmpdiK2xl9XVqsxz1/WbbK2qjQVZfWR6LSdIZRk1L05ZKeI0tzTppXG/h v32Q== X-Forwarded-Encrypted: i=1; AJvYcCVi43XXLWdBRz6OpG/SAOrWHrRBFNaajx3t9yW7a/Dbv7xtqCD3lpZSEc6oUAfgjoo2UB+sy8yTh9f6O5k=@vger.kernel.org X-Gm-Message-State: AOJu0YzjPRxF7oIxpSolMhK3y280yDFqs9p+d0GOvs3+XtovKDPoarAP 6IwLVREWeNmnUWahbIrnFKSicqRTVoU5CpDZNyMR/ldD9vEq9dzH X-Google-Smtp-Source: AGHT+IGpYva06f1FOiHhlRMbZ9nmuMmHEPsYHgf5mxg8wBqak1kBhd2jWqR4HEB5jI0I/wBjcbP2AQ== X-Received: by 2002:a05:6358:5f02:b0:1b3:8960:986f with SMTP id e5c5f4694b2df-1b5c3b0fab6mr797160855d.19.1724576263352; Sun, 25 Aug 2024 01:57:43 -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.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Aug 2024 01:57:43 -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 2/4] soc: ti: pruss: do device_node auto cleanup Date: Sun, 25 Aug 2024 14:18:43 +0530 Message-ID: <20240825085714.10736-3-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> 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, use dev_err_probe() instead of dev_err() in all the code paths touched. Suggested-by: Julia Lawall Signed-off-by: Kousik Sanagavarapu --- drivers/soc/ti/pruss.c | 91 +++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 58 deletions(-) diff --git a/drivers/soc/ti/pruss.c b/drivers/soc/ti/pruss.c index 83d7d8d5ef22..3ec758f50e24 100644 --- a/drivers/soc/ti/pruss.c +++ b/drivers/soc/ti/pruss.c @@ -380,50 +380,42 @@ static int pruss_clk_mux_setup(struct pruss *pruss, s= truct clk *clk_mux, =20 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; - - data =3D of_device_get_match_data(dev); + struct device_node *clks_np __free(device_node) =3D + of_get_child_by_name(cfg_node, "clocks"); + const struct pruss_private_data *data =3D of_device_get_match_data(dev); + int ret; =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; - } + 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; - } - -put_clks_node: - of_node_put(clks_np); + if (ret) + return dev_err_probe(dev, ret, "failed to setup iepclk-mux\n"); =20 - return ret; + return 0; } =20 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; + struct device_node *child __free(device_node) =3D + of_get_child_by_name(np, "memories"); const struct pruss_private_data *data =3D of_device_get_match_data(dev); const char *mem_names[PRUSS_MEM_MAX] =3D { "dram0", "dram1", "shrdram2" }; int i; =20 - child =3D of_get_child_by_name(np, "memories"); if (!child) return dev_err_probe(dev, -ENODEV, "%pOF is missing its 'memories' node\n", @@ -442,24 +434,18 @@ static int pruss_of_setup_memories(struct device *dev= , struct pruss *pruss) =20 index =3D of_property_match_string(child, "reg-names", mem_names[i]); - if (index < 0) { - of_node_put(child); + if (index < 0) return index; - } =20 - if (of_address_to_resource(child, index, &res)) { - of_node_put(child); + if (of_address_to_resource(child, index, &res)) return -EINVAL; - } =20 pruss->mem_regions[i].va =3D devm_ioremap(dev, res.start, resource_size(&res)); - if (!pruss->mem_regions[i].va) { - of_node_put(child); + 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); =20 @@ -467,7 +453,6 @@ static int pruss_of_setup_memories(struct device *dev, = struct pruss *pruss) mem_names[i], &pruss->mem_regions[i].pa, pruss->mem_regions[i].size, pruss->mem_regions[i].va); } - of_node_put(child); =20 return 0; } @@ -481,26 +466,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); @@ -509,20 +489,15 @@ 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; + return 0; } =20 static int pruss_probe(struct platform_device *pdev) --=20 2.46.0.290.g4f02c709e8.dirty