From: Patrice CHOTARD <patrice.chotard@foss.st.com>
To: "Peng Fan (OSS)" <peng.fan@oss.nxp.com>,
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>,
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: Re: [PATCH v2 08/20] pinctrl: st: Use scope based of_node_put() cleanups
Date: Fri, 17 May 2024 08:44:23 +0200 [thread overview]
Message-ID: <e2b89d34-0222-42a1-98ae-c417220f9b39@foss.st.com> (raw)
In-Reply-To: <20240504-pinctrl-cleanup-v2-8-26c5f2dc1181@nxp.com>
On 5/4/24 15:20, Peng Fan (OSS) wrote:
> 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/pinctrl-st.c | 37 +++++++++++--------------------------
> 1 file changed, 11 insertions(+), 26 deletions(-)
>
> diff --git a/drivers/pinctrl/pinctrl-st.c b/drivers/pinctrl/pinctrl-st.c
> index 5d9abd6547d0..fe2d52e434db 100644
> --- a/drivers/pinctrl/pinctrl-st.c
> +++ b/drivers/pinctrl/pinctrl-st.c
> @@ -1195,10 +1195,10 @@ static int st_pctl_dt_parse_groups(struct device_node *np,
> struct property *pp;
> struct device *dev = info->dev;
> struct st_pinconf *conf;
> - struct device_node *pins;
> + struct device_node *pins __free(device_node) = NULL;
> phandle bank;
> unsigned int offset;
> - int i = 0, npins = 0, nr_props, ret = 0;
> + int i = 0, npins = 0, nr_props;
>
> pins = of_get_child_by_name(np, "st,pins");
> if (!pins)
> @@ -1213,8 +1213,7 @@ static int st_pctl_dt_parse_groups(struct device_node *np,
> npins++;
> } else {
> pr_warn("Invalid st,pins in %pOFn node\n", np);
> - ret = -EINVAL;
> - goto out_put_node;
> + return -EINVAL;
> }
> }
>
> @@ -1223,10 +1222,8 @@ static int st_pctl_dt_parse_groups(struct device_node *np,
> grp->pins = devm_kcalloc(dev, npins, sizeof(*grp->pins), GFP_KERNEL);
> grp->pin_conf = devm_kcalloc(dev, npins, sizeof(*grp->pin_conf), GFP_KERNEL);
>
> - if (!grp->pins || !grp->pin_conf) {
> - ret = -ENOMEM;
> - goto out_put_node;
> - }
> + if (!grp->pins || !grp->pin_conf)
> + return -ENOMEM;
>
> /* <bank offset mux direction rt_type rt_delay rt_clk> */
> for_each_property_of_node(pins, pp) {
> @@ -1260,17 +1257,13 @@ static int st_pctl_dt_parse_groups(struct device_node *np,
> i++;
> }
>
> -out_put_node:
> - of_node_put(pins);
> -
> - return ret;
> + return 0;
> }
>
> static int st_pctl_parse_functions(struct device_node *np,
> struct st_pinctrl *info, u32 index, int *grp_index)
> {
> struct device *dev = info->dev;
> - struct device_node *child;
> struct st_pmx_func *func;
> struct st_pctl_group *grp;
> int ret, i;
> @@ -1285,15 +1278,13 @@ static int st_pctl_parse_functions(struct device_node *np,
> return -ENOMEM;
>
> i = 0;
> - for_each_child_of_node(np, child) {
> + for_each_child_of_node_scoped(np, child) {
> func->groups[i] = child->name;
> grp = &info->groups[*grp_index];
> *grp_index += 1;
> ret = st_pctl_dt_parse_groups(child, grp, info, i++);
> - if (ret) {
> - of_node_put(child);
> + if (ret)
> return ret;
> - }
> }
> dev_info(dev, "Function[%d\t name:%s,\tgroups:%d]\n", index, func->name, func->ngroups);
>
> @@ -1601,7 +1592,6 @@ static int st_pctl_probe_dt(struct platform_device *pdev,
> int i = 0, j = 0, k = 0, bank;
> struct pinctrl_pin_desc *pdesc;
> struct device_node *np = dev->of_node;
> - struct device_node *child;
> int grp_index = 0;
> int irq = 0;
>
> @@ -1646,25 +1636,21 @@ static int st_pctl_probe_dt(struct platform_device *pdev,
> pctl_desc->pins = pdesc;
>
> bank = 0;
> - for_each_child_of_node(np, child) {
> + for_each_child_of_node_scoped(np, child) {
> if (of_property_read_bool(child, "gpio-controller")) {
> const char *bank_name = NULL;
> char **pin_names;
>
> ret = st_gpiolib_register_bank(info, bank, child);
> - if (ret) {
> - of_node_put(child);
> + if (ret)
> return ret;
> - }
>
> k = info->banks[bank].range.pin_base;
> bank_name = info->banks[bank].range.name;
>
> pin_names = devm_kasprintf_strarray(dev, bank_name, ST_GPIO_PINS_PER_BANK);
> - if (IS_ERR(pin_names)) {
> - of_node_put(child);
> + if (IS_ERR(pin_names))
> return PTR_ERR(pin_names);
> - }
>
> for (j = 0; j < ST_GPIO_PINS_PER_BANK; j++, k++) {
> pdesc->number = k;
> @@ -1678,7 +1664,6 @@ static int st_pctl_probe_dt(struct platform_device *pdev,
> i++, &grp_index);
> if (ret) {
> dev_err(dev, "No functions found.\n");
> - of_node_put(child);
> return ret;
> }
> }
>
Reviewed-by: Patrice Chotard <patrice.chotard@foss.st.com>
Thanks
Patrice
next prev parent reply other threads:[~2024-05-17 6:45 UTC|newest]
Thread overview: 46+ 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-30 10:46 ` Thierry Reding
2024-05-04 13:20 ` [PATCH v2 03/20] pinctrl: stm32: " Peng Fan (OSS)
2024-05-17 6:11 ` Patrice CHOTARD
2024-05-27 12:56 ` Linus Walleij
2024-05-04 13:20 ` [PATCH v2 04/20] pinctrl: starfive: " Peng Fan (OSS)
2024-05-27 14:25 ` Markus Elfring
2024-05-30 8:41 ` Peng Fan
2024-05-30 9:40 ` [v2 " Markus Elfring
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-30 9:02 ` Andy Shevchenko
2024-05-30 9:21 ` Geert Uytterhoeven
2024-05-04 13:20 ` [PATCH v2 08/20] pinctrl: st: " Peng Fan (OSS)
2024-05-17 6:44 ` Patrice CHOTARD [this message]
2024-05-27 12:57 ` Linus Walleij
2024-05-30 9:04 ` Andy Shevchenko
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-27 15:56 ` Markus Elfring
2024-05-30 8:44 ` Peng Fan
2024-05-30 9:50 ` [v2 " Markus Elfring
2024-05-30 9:54 ` Peng Fan
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 ` [PATCH v2 20/20] pinctrl: samsung: " Peng Fan (OSS)
2024-05-30 11:56 ` [PATCH v2 00/20] pinctrl: " Geert Uytterhoeven
2024-05-31 3:07 ` Peng Fan
2024-05-31 7:06 ` Geert Uytterhoeven
2024-06-18 11:52 ` Peng Fan
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=e2b89d34-0222-42a1-98ae-c417220f9b39@foss.st.com \
--to=patrice.chotard@foss.st.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=peng.fan@nxp.com \
--cc=peng.fan@oss.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).