From: "Peng Fan (OSS)" <peng.fan@oss.nxp.com>
To: Linus Walleij <linus.walleij@linaro.org>,
Thierry Reding <thierry.reding@gmail.com>,
Jonathan Hunter <jonathanh@nvidia.com>,
Dvorkin Dmitry <dvorkin@tibbo.com>,
Wells Lu <wellslutw@gmail.com>,
Maxime Coquelin <mcoquelin.stm32@gmail.com>,
Alexandre Torgue <alexandre.torgue@foss.st.com>,
Emil Renner Berthing <kernel@esmil.dk>,
Jianlong Huang <jianlong.huang@starfivetech.com>,
Hal Feng <hal.feng@starfivetech.com>,
Orson Zhai <orsonzhai@gmail.com>,
Baolin Wang <baolin.wang@linux.alibaba.com>,
Chunyan Zhang <zhang.lyra@gmail.com>,
Viresh Kumar <vireshk@kernel.org>,
Shiraz Hashim <shiraz.linux.kernel@gmail.com>,
soc@kernel.org, Krzysztof Kozlowski <krzk@kernel.org>,
Sylwester Nawrocki <s.nawrocki@samsung.com>,
Alim Akhtar <alim.akhtar@samsung.com>,
Geert Uytterhoeven <geert+renesas@glider.be>,
Patrice Chotard <patrice.chotard@foss.st.com>,
Heiko Stuebner <heiko@sntech.de>,
Damien Le Moal <dlemoal@kernel.org>,
Ludovic Desroches <ludovic.desroches@microchip.com>,
Nicolas Ferre <nicolas.ferre@microchip.com>,
Alexandre Belloni <alexandre.belloni@bootlin.com>,
Claudiu Beznea <claudiu.beznea@tuxon.dev>,
Dong Aisheng <aisheng.dong@nxp.com>,
Fabio Estevam <festevam@gmail.com>,
Shawn Guo <shawnguo@kernel.org>, Jacky Bai <ping.bai@nxp.com>,
Pengutronix Kernel Team <kernel@pengutronix.de>,
Chester Lin <chester62515@gmail.com>,
Matthias Brugger <mbrugger@suse.com>,
Ghennadi Procopciuc <ghennadi.procopciuc@oss.nxp.com>,
Sean Wang <sean.wang@kernel.org>,
Matthias Brugger <matthias.bgg@gmail.com>,
AngeloGioacchino Del Regno
<angelogioacchino.delregno@collabora.com>,
Sascha Hauer <s.hauer@pengutronix.de>,
Andrew Jeffery <andrew@codeconstruct.com.au>,
Joel Stanley <joel@jms.id.au>,
Dan Carpenter <dan.carpenter@linaro.org>,
Tony Lindgren <tony@atomide.com>,
Stephen Warren <swarren@wwwdotorg.org>
Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-tegra@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-stm32@st-md-mailman.stormreply.com,
linux-samsung-soc@vger.kernel.org,
linux-renesas-soc@vger.kernel.org,
linux-rockchip@lists.infradead.org,
linux-riscv@lists.infradead.org,
linux-mediatek@lists.infradead.org, imx@lists.linux.dev,
linux-aspeed@lists.ozlabs.org, openbmc@lists.ozlabs.org,
Peng Fan <peng.fan@nxp.com>
Subject: [PATCH v2 20/20] pinctrl: samsung: Use scope based of_node_put() cleanups
Date: Sat, 04 May 2024 21:20:18 +0800 [thread overview]
Message-ID: <20240504-pinctrl-cleanup-v2-20-26c5f2dc1181@nxp.com> (raw)
In-Reply-To: <20240504-pinctrl-cleanup-v2-0-26c5f2dc1181@nxp.com>
From: Peng Fan <peng.fan@nxp.com>
Use scope based of_node_put() cleanup to simplify code.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
drivers/pinctrl/samsung/pinctrl-exynos.c | 16 ++++------------
drivers/pinctrl/samsung/pinctrl-samsung.c | 19 +++++--------------
2 files changed, 9 insertions(+), 26 deletions(-)
diff --git a/drivers/pinctrl/samsung/pinctrl-exynos.c b/drivers/pinctrl/samsung/pinctrl-exynos.c
index 871c1eb46ddf..3775999536e2 100644
--- a/drivers/pinctrl/samsung/pinctrl-exynos.c
+++ b/drivers/pinctrl/samsung/pinctrl-exynos.c
@@ -582,7 +582,7 @@ static void exynos_irq_demux_eint16_31(struct irq_desc *desc)
__init int exynos_eint_wkup_init(struct samsung_pinctrl_drv_data *d)
{
struct device *dev = d->dev;
- struct device_node *wkup_np = NULL;
+ struct device_node *wkup_np __free(device_node) = NULL;
struct device_node *np;
struct samsung_pin_bank *bank;
struct exynos_weint_data *weint_data;
@@ -612,17 +612,14 @@ __init int exynos_eint_wkup_init(struct samsung_pinctrl_drv_data *d)
bank->irq_chip = devm_kmemdup(dev, irq_chip, sizeof(*irq_chip),
GFP_KERNEL);
- if (!bank->irq_chip) {
- of_node_put(wkup_np);
+ if (!bank->irq_chip)
return -ENOMEM;
- }
bank->irq_chip->chip.name = bank->name;
bank->irq_domain = irq_domain_create_linear(bank->fwnode,
bank->nr_pins, &exynos_eint_irqd_ops, bank);
if (!bank->irq_domain) {
dev_err(dev, "wkup irq domain add failed\n");
- of_node_put(wkup_np);
return -ENXIO;
}
@@ -635,10 +632,8 @@ __init int exynos_eint_wkup_init(struct samsung_pinctrl_drv_data *d)
weint_data = devm_kcalloc(dev,
bank->nr_pins, sizeof(*weint_data),
GFP_KERNEL);
- if (!weint_data) {
- of_node_put(wkup_np);
+ if (!weint_data)
return -ENOMEM;
- }
for (idx = 0; idx < bank->nr_pins; ++idx) {
irq = irq_of_parse_and_map(to_of_node(bank->fwnode), idx);
@@ -655,13 +650,10 @@ __init int exynos_eint_wkup_init(struct samsung_pinctrl_drv_data *d)
}
}
- if (!muxed_banks) {
- of_node_put(wkup_np);
+ if (!muxed_banks)
return 0;
- }
irq = irq_of_parse_and_map(wkup_np, 0);
- of_node_put(wkup_np);
if (!irq) {
dev_err(dev, "irq number for muxed EINTs not found\n");
return 0;
diff --git a/drivers/pinctrl/samsung/pinctrl-samsung.c b/drivers/pinctrl/samsung/pinctrl-samsung.c
index ed07e23e0912..0d4d7ebf7145 100644
--- a/drivers/pinctrl/samsung/pinctrl-samsung.c
+++ b/drivers/pinctrl/samsung/pinctrl-samsung.c
@@ -250,7 +250,6 @@ static int samsung_dt_node_to_map(struct pinctrl_dev *pctldev,
{
struct samsung_pinctrl_drv_data *drvdata;
unsigned reserved_maps;
- struct device_node *np;
int ret;
drvdata = pinctrl_dev_get_drvdata(pctldev);
@@ -265,12 +264,11 @@ static int samsung_dt_node_to_map(struct pinctrl_dev *pctldev,
&reserved_maps,
num_maps);
- for_each_child_of_node(np_config, np) {
+ for_each_child_of_node_scoped(np_config, np) {
ret = samsung_dt_subnode_to_map(drvdata, pctldev->dev, np, map,
&reserved_maps, num_maps);
if (ret < 0) {
samsung_dt_free_map(pctldev, *map, *num_maps);
- of_node_put(np);
return ret;
}
}
@@ -791,16 +789,12 @@ static struct samsung_pmx_func *samsung_pinctrl_create_functions(
* and create pin groups and pin function lists.
*/
func_cnt = 0;
- for_each_child_of_node(dev_np, cfg_np) {
- struct device_node *func_np;
-
+ for_each_child_of_node_scoped(dev_np, cfg_np) {
if (!of_get_child_count(cfg_np)) {
ret = samsung_pinctrl_create_function(dev, drvdata,
cfg_np, func);
- if (ret < 0) {
- of_node_put(cfg_np);
+ if (ret < 0)
return ERR_PTR(ret);
- }
if (ret > 0) {
++func;
++func_cnt;
@@ -808,14 +802,11 @@ static struct samsung_pmx_func *samsung_pinctrl_create_functions(
continue;
}
- for_each_child_of_node(cfg_np, func_np) {
+ for_each_child_of_node_scoped(cfg_np, func_np) {
ret = samsung_pinctrl_create_function(dev, drvdata,
func_np, func);
- if (ret < 0) {
- of_node_put(func_np);
- of_node_put(cfg_np);
+ if (ret < 0)
return ERR_PTR(ret);
- }
if (ret > 0) {
++func;
++func_cnt;
--
2.37.1
prev parent reply other threads:[~2024-05-04 13:17 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-04 13:19 [PATCH v2 00/20] pinctrl: Use scope based of_node_put() cleanups Peng Fan (OSS)
2024-05-04 13:19 ` [PATCH v2 01/20] pinctrl: ti: iodelay: " Peng Fan (OSS)
2024-05-04 13:20 ` [PATCH v2 02/20] pinctrl: tegra: " Peng Fan (OSS)
2024-05-04 13:20 ` [PATCH v2 03/20] pinctrl: stm32: " Peng Fan (OSS)
2024-05-17 6:11 ` Patrice CHOTARD
2024-05-04 13:20 ` [PATCH v2 04/20] pinctrl: starfive: " Peng Fan (OSS)
2024-05-04 13:20 ` [PATCH v2 05/20] pinctrl: sprd: " Peng Fan (OSS)
2024-05-04 13:20 ` [PATCH v2 06/20] pinctrl: spear: " Peng Fan (OSS)
2024-05-04 13:20 ` [PATCH v2 07/20] pinctrl: renesas: " Peng Fan (OSS)
2024-05-13 11:59 ` Geert Uytterhoeven
2024-05-13 12:04 ` Peng Fan
2024-05-13 20:51 ` Linus Walleij
2024-05-14 6:35 ` Geert Uytterhoeven
2024-05-14 7:33 ` Linus Walleij
2024-05-14 8:06 ` Geert Uytterhoeven
2024-05-04 13:20 ` [PATCH v2 08/20] pinctrl: st: " Peng Fan (OSS)
2024-05-17 6:44 ` Patrice CHOTARD
2024-05-04 13:20 ` [PATCH v2 09/20] pinctrl: rockchip: " Peng Fan (OSS)
2024-05-04 13:20 ` [PATCH v2 10/20] pinctrl: equilibrium: " Peng Fan (OSS)
2024-05-04 13:20 ` [PATCH v2 11/20] pinctrl: at91: " Peng Fan (OSS)
2024-05-04 13:20 ` [PATCH v2 12/20] pinctrl: s32cc: " Peng Fan (OSS)
2024-05-04 13:20 ` [PATCH v2 13/20] pinctrl: nomadik: " Peng Fan (OSS)
2024-05-04 13:20 ` [PATCH v2 14/20] pinctrl: mediatek: " Peng Fan (OSS)
2024-05-04 13:20 ` [PATCH v2 15/20] pinctrl: freescale: " Peng Fan (OSS)
2024-05-04 13:20 ` [PATCH v2 16/20] pinctrl: bcm: bcm63xx: " Peng Fan (OSS)
2024-05-04 13:20 ` [PATCH v2 17/20] pinctrl: pinconf-generic: " Peng Fan (OSS)
2024-05-04 13:20 ` [PATCH v2 18/20] pinctrl: freescale: mxs: Fix refcount of child Peng Fan (OSS)
2024-05-04 13:20 ` [PATCH v2 19/20] pinctrl: k210: Use scope based of_node_put() cleanups Peng Fan (OSS)
2024-05-04 13:20 ` Peng Fan (OSS) [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240504-pinctrl-cleanup-v2-20-26c5f2dc1181@nxp.com \
--to=peng.fan@oss.nxp.com \
--cc=aisheng.dong@nxp.com \
--cc=alexandre.belloni@bootlin.com \
--cc=alexandre.torgue@foss.st.com \
--cc=alim.akhtar@samsung.com \
--cc=andrew@codeconstruct.com.au \
--cc=angelogioacchino.delregno@collabora.com \
--cc=baolin.wang@linux.alibaba.com \
--cc=chester62515@gmail.com \
--cc=claudiu.beznea@tuxon.dev \
--cc=dan.carpenter@linaro.org \
--cc=dlemoal@kernel.org \
--cc=dvorkin@tibbo.com \
--cc=festevam@gmail.com \
--cc=geert+renesas@glider.be \
--cc=ghennadi.procopciuc@oss.nxp.com \
--cc=hal.feng@starfivetech.com \
--cc=heiko@sntech.de \
--cc=imx@lists.linux.dev \
--cc=jianlong.huang@starfivetech.com \
--cc=joel@jms.id.au \
--cc=jonathanh@nvidia.com \
--cc=kernel@esmil.dk \
--cc=kernel@pengutronix.de \
--cc=krzk@kernel.org \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-aspeed@lists.ozlabs.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=linux-tegra@vger.kernel.org \
--cc=ludovic.desroches@microchip.com \
--cc=matthias.bgg@gmail.com \
--cc=mbrugger@suse.com \
--cc=mcoquelin.stm32@gmail.com \
--cc=nicolas.ferre@microchip.com \
--cc=openbmc@lists.ozlabs.org \
--cc=orsonzhai@gmail.com \
--cc=patrice.chotard@foss.st.com \
--cc=peng.fan@nxp.com \
--cc=ping.bai@nxp.com \
--cc=s.hauer@pengutronix.de \
--cc=s.nawrocki@samsung.com \
--cc=sean.wang@kernel.org \
--cc=shawnguo@kernel.org \
--cc=shiraz.linux.kernel@gmail.com \
--cc=soc@kernel.org \
--cc=swarren@wwwdotorg.org \
--cc=thierry.reding@gmail.com \
--cc=tony@atomide.com \
--cc=vireshk@kernel.org \
--cc=wellslutw@gmail.com \
--cc=zhang.lyra@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).