From patchwork Sun Aug 25 08:48:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kousik Sanagavarapu X-Patchwork-Id: 13776723 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 B844EC5320E for ; Sun, 25 Aug 2024 09:00:05 +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=jNMuyrfijznIh50InJIHyOaHM84gPkC0aoCc4qU4CQ4=; b=epCuZMwd3j8udUEif93bw4vl6m ZdNeYB6uE7b8STTLIw1MsO4BrFYxvttLuxvbb32894+xRoitchQ/Hsa/n5jEsVQjzIy4wzBIohdG9 iWh8jmecb1Ee9PY/rB/Hw56C3a1Jm5mEQawGicCRn76IxSIy3qlGEtigI+qpD1EwyiPnvsyzAebA7 FiqswsgfkZwLu+TiVKEDwxkRhR43QRurOglScBP9y05DXoT1oP6XDeY/MFU7xFR0nq+2EVAAX08q0 XMdTHP+xQ/DZ3Vykr2srHxrbdboxgiL573WLeMonFDX4GzGNf8uPH+RHMsxvAmNI4LbeFIQTlYZ3r JuC6pTOA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1si96J-00000004149-3zdV; Sun, 25 Aug 2024 08:59:55 +0000 Received: from mail-oo1-xc34.google.com ([2607:f8b0:4864:20::c34]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1si94D-000000040cx-08OJ for linux-arm-kernel@lists.infradead.org; Sun, 25 Aug 2024 08:57:48 +0000 Received: by mail-oo1-xc34.google.com with SMTP id 006d021491bc7-5d5b1e33fa8so2584710eaf.3 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=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=jNMuyrfijznIh50InJIHyOaHM84gPkC0aoCc4qU4CQ4=; b=fdA6vmf+EKkGGJCDYaw7c6kjuAhvRo4gqD/boMzVHbd4e9YcGOECFWbVUsuS+KOQmv H//nPJs8N651Ou3D3MMhTkJdN9MS/LliLeQV1baKZMHO/onKYHVAO2mVJPBU3zuqTZn7 31HgS8Mfh0Z9snPsS/KwzMETeeFdDR+jtV2WPx4gfoo24ivmZtYlqoc/PUiY31IgX1SF 3kckCv0Ae7JrW9allWeZrbgVuqwH4WE/rKiiR7WQ+CBWL4rG85FeJ8wcz1x/ItqwIfLj /N7/Gz2U8tM/cbf1GrDCZleDeFCK54DegJRzt2pP7nUMbng6b0ExMofa2n/xsX8qmusG IbBQ== 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=s0aTOliIixnXsN2k5ZMc9peK+mXqaIwjmVg3MSG0zMjzMTrKLFeCt7OtYuMwlCK4KZ 6VBdO8bXVbUM55G/yLns4lq9bT4DC6zGYlq2514E9iDmUT3OzWAoIXmC/TpBjzwSDakm aySNvfa86yjnMKT720V5z2nuHezHRQUP78MvgsDKyu7cWo5piWvaJbQDY9nCZtdT4flx GtENBGaGV+9xuVJu+tI1fxgjwO3h89rjm5BT5G5k1FC94RpjvKp6oDSZPZpQttygBiwW brQ3jXJF6BGdNw/4K2yJ8PC0i+xgKgq4hbnJ0RLecv4oN8qdxkyPXCGQN2CXOAQhAY7V Gv5w== X-Forwarded-Encrypted: i=1; AJvYcCWtIdl2YSUGp53gyomPg0LHxYkv9rvkel+CwIbKfnbkg34TWyT45Y5LuoDSCPaRGdWrVByd58N+mU1s2dywNRdN@lists.infradead.org X-Gm-Message-State: AOJu0YwNDxnOPt0pV4aRb7lf/PSBhzF+xCwYu9r+Lb9K03PK94bpwdML 5xxFpsuAbLW7BCsU39Yn9+G3JCtYomH6QJtMe7NgpbE3q0T/O3Zh 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> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240825_015745_139659_5E30D93A X-CRM114-Status: GOOD ( 17.35 ) 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 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, struct clk *clk_mux, static int pruss_clk_init(struct pruss *pruss, struct device_node *cfg_node) { - const struct pruss_private_data *data; - struct device_node *clks_np; struct device *dev = pruss->dev; - int ret = 0; - - data = of_device_get_match_data(dev); + struct device_node *clks_np __free(device_node) = + of_get_child_by_name(cfg_node, "clocks"); + const struct pruss_private_data *data = of_device_get_match_data(dev); + int ret; - clks_np = 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); if (data && data->has_core_mux_clock) { ret = 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"); } ret = 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"); - return ret; + return 0; } static int pruss_of_setup_memories(struct device *dev, struct pruss *pruss) { struct device_node *np = dev_of_node(dev); - struct device_node *child; + struct device_node *child __free(device_node) = + of_get_child_by_name(np, "memories"); const struct pruss_private_data *data = of_device_get_match_data(dev); const char *mem_names[PRUSS_MEM_MAX] = { "dram0", "dram1", "shrdram2" }; int i; - child = 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) index = of_property_match_string(child, "reg-names", mem_names[i]); - if (index < 0) { - of_node_put(child); + if (index < 0) return index; - } - if (of_address_to_resource(child, index, &res)) { - of_node_put(child); + if (of_address_to_resource(child, index, &res)) return -EINVAL; - } pruss->mem_regions[i].va = 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 = res.start; pruss->mem_regions[i].size = resource_size(&res); @@ -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); return 0; } @@ -481,26 +466,21 @@ static struct regmap_config regmap_conf = { static int pruss_cfg_of_init(struct device *dev, struct pruss *pruss) { struct device_node *np = dev_of_node(dev); - struct device_node *child; + struct device_node *child __free(device_node) = + of_get_child_by_name(np, "cfg"); struct resource res; int ret; - child = 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); - if (of_address_to_resource(child, 0, &res)) { - ret = -ENOMEM; - goto node_put; - } + if (of_address_to_resource(child, 0, &res)) + return -ENOMEM; pruss->cfg_base = devm_ioremap(dev, res.start, resource_size(&res)); - if (!pruss->cfg_base) { - ret = -ENOMEM; - goto node_put; - } + if (!pruss->cfg_base) + return -ENOMEM; regmap_conf.name = kasprintf(GFP_KERNEL, "%pOFn@%llx", child, (u64)res.start); @@ -509,20 +489,15 @@ static int pruss_cfg_of_init(struct device *dev, struct pruss *pruss) pruss->cfg_regmap = 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 = %ld\n", - PTR_ERR(pruss->cfg_regmap)); - ret = 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"); ret = pruss_clk_init(pruss, child); if (ret) - dev_err(dev, "pruss_clk_init failed, ret = %d\n", ret); + return dev_err_probe(dev, ret, "pruss_clk_init failed\n"); -node_put: - of_node_put(child); - return ret; + return 0; } static int pruss_probe(struct platform_device *pdev)