| Message ID | 20240504-pinctrl-cleanup-v2-0-26c5f2dc1181@nxp.com |
|---|---|
| Headers | show |
| Series | pinctrl: Use scope based of_node_put() cleanups | expand |
Hi Peng, On Sat, May 4, 2024 at 3:14 PM Peng Fan (OSS) <peng.fan@oss.nxp.com> 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> Thanks for your patch! Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Acked-by: Geert Uytterhoeven <geert+renesas@glider.be> > --- a/drivers/pinctrl/renesas/pinctrl-rzn1.c > +++ b/drivers/pinctrl/renesas/pinctrl-rzn1.c You missed one trivial conversion, presumably because no error handling and thus no of_node_put() is involved? @@ -737,13 +737,12 @@ static int rzn1_pinctrl_parse_groups(struct device_node *np, static int rzn1_pinctrl_count_function_groups(struct device_node *np) { - struct device_node *child; int count = 0; if (of_property_count_u32_elems(np, RZN1_PINS_PROP) > 0) count++; - for_each_child_of_node(np, child) { + for_each_child_of_node_scoped(np, child) { if (of_property_count_u32_elems(child, RZN1_PINS_PROP) > 0) count++; } If you prefer not to include this, I will send a small patch myself later. Gr{oetje,eeting}s, Geert
> Subject: Re: [PATCH v2 07/20] pinctrl: renesas: Use scope based > of_node_put() cleanups > > Hi Peng, > > On Sat, May 4, 2024 at 3:14 PM Peng Fan (OSS) <peng.fan@oss.nxp.com> > 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> > > Thanks for your patch! > > Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> > Acked-by: Geert Uytterhoeven <geert+renesas@glider.be> > > > --- a/drivers/pinctrl/renesas/pinctrl-rzn1.c > > +++ b/drivers/pinctrl/renesas/pinctrl-rzn1.c > > You missed one trivial conversion, presumably because no error handling and > thus no of_node_put() is involved? You are right. > > @@ -737,13 +737,12 @@ static int rzn1_pinctrl_parse_groups(struct > device_node *np, > > static int rzn1_pinctrl_count_function_groups(struct device_node *np) { > - struct device_node *child; > int count = 0; > > if (of_property_count_u32_elems(np, RZN1_PINS_PROP) > 0) > count++; > > - for_each_child_of_node(np, child) { > + for_each_child_of_node_scoped(np, child) { > if (of_property_count_u32_elems(child, RZN1_PINS_PROP) > 0) > count++; > } > > If you prefer not to include this, I will send a small patch myself later. I would not add it. If no major comments in this patchset, I will not do a v3. So, please do that with your follow up patch. Thanks, Peng. > > Gr{oetje,eeting}s, > > Geert > > -- > Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux- > m68k.org > > In personal conversations with technical people, I call myself a hacker. But > when I'm talking to journalists I just say "programmer" or something like that. > -- Linus Torvalds
On Mon, May 13, 2024 at 1:59 PM Geert Uytterhoeven <geert@linux-m68k.org> wrote: > On Sat, May 4, 2024 at 3:14 PM Peng Fan (OSS) <peng.fan@oss.nxp.com> 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> > > Thanks for your patch! > > Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> > Acked-by: Geert Uytterhoeven <geert+renesas@glider.be> Does this go into the Renesas patch stack? I think the patch stands fine without the rest of the series. Yours, Linus Walleij
Hi Linus, On Mon, May 13, 2024 at 10:51 PM Linus Walleij <linus.walleij@linaro.org> wrote: > On Mon, May 13, 2024 at 1:59 PM Geert Uytterhoeven <geert@linux-m68k.org> wrote: > > On Sat, May 4, 2024 at 3:14 PM Peng Fan (OSS) <peng.fan@oss.nxp.com> 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> > > > > Thanks for your patch! > > > > Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> > > Acked-by: Geert Uytterhoeven <geert+renesas@glider.be> > > Does this go into the Renesas patch stack? > > I think the patch stands fine without the rest of the series. Sure, I can do that.
On Tue, May 14, 2024 at 8:36 AM Geert Uytterhoeven <geert@linux-m68k.org> wrote: > > Does this go into the Renesas patch stack? > > > > I think the patch stands fine without the rest of the series. > > Sure, I can do that. Please apply it! > From your positive response to v1, I thought that perhaps you just > wanted to take the full series yourself? Sorry, I always prefer submaintainers to pick their stuff, they know what they are doing and they can test the entire patch stack properly. Yours, Linus Walleij
On Tue, May 14, 2024 at 9:33 AM Linus Walleij <linus.walleij@linaro.org> wrote: > On Tue, May 14, 2024 at 8:36 AM Geert Uytterhoeven <geert@linux-m68k.org> wrote: > > > Does this go into the Renesas patch stack? > > > I think the patch stands fine without the rest of the series. > > > > Sure, I can do that. > > Please apply it! OK, will queue in renesas-pinctrl for v6.11. > > From your positive response to v1, I thought that perhaps you just > > wanted to take the full series yourself? > > Sorry, I always prefer submaintainers to pick their stuff, they > know what they are doing and they can test the entire patch > stack properly. OK, will (try to ;-) remember... Gr{oetje,eeting}s, Geert
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/stm32/pinctrl-stm32.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/pinctrl/stm32/pinctrl-stm32.c b/drivers/pinctrl/stm32/pinctrl-stm32.c > index 978ccdbaf3d3..a8673739871d 100644 > --- a/drivers/pinctrl/stm32/pinctrl-stm32.c > +++ b/drivers/pinctrl/stm32/pinctrl-stm32.c > @@ -670,7 +670,6 @@ static int stm32_pctrl_dt_node_to_map(struct pinctrl_dev *pctldev, > struct device_node *np_config, > struct pinctrl_map **map, unsigned *num_maps) > { > - struct device_node *np; > unsigned reserved_maps; > int ret; > > @@ -678,12 +677,11 @@ static int stm32_pctrl_dt_node_to_map(struct pinctrl_dev *pctldev, > *num_maps = 0; > reserved_maps = 0; > > - for_each_child_of_node(np_config, np) { > + for_each_child_of_node_scoped(np_config, np) { > ret = stm32_pctrl_dt_subnode_to_map(pctldev, np, map, > &reserved_maps, num_maps); > if (ret < 0) { > pinctrl_utils_free_map(pctldev, *map, *num_maps); > - of_node_put(np); > return ret; > } > } > Hi Reviewed-by: Patrice Chotard <patrice.chotard@foss.st.com> Thanks Patrice
On Sat, May 4, 2024 at 3:13 PM Peng Fan (OSS) <peng.fan@oss.nxp.com> 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> Patch applied. Yours, Linus Walleij
Hi Peng, On Sat, May 4, 2024 at 3:12 PM Peng Fan (OSS) <peng.fan@oss.nxp.com> wrote: > Use scope based of_node_put() to simplify code. It reduces the chance > of forgetting of_node_put(), and also simplifies error handling path. > I not able to test the changes on all the hardwares, so driver owners, > please help review when you have time. > > This patchset was inspired from Dan's comments on pinctrl-scmi-imx.c, > thanks. > > Signed-off-by: Peng Fan <peng.fan@nxp.com> Andy's question about code generation on a related patch made me wonder, too. On arm32, a conversion to for_each_child_of_node_scoped() seems to cost ca. 48 bytes of additional code, regardless of whether there were explicit cleanups before or not. I checked "pinctrl: renesas: Use scope based of_node_put() cleanups", and all but the conversions in *_dt_node_to_map() cost 48 bytes each. Gr{oetje,eeting}s, Geert
Hi Geert > Subject: Re: [PATCH v2 00/20] pinctrl: Use scope based of_node_put() > cleanups > > Hi Peng, > > On Sat, May 4, 2024 at 3:12 PM Peng Fan (OSS) <peng.fan@oss.nxp.com> > wrote: > > Use scope based of_node_put() to simplify code. It reduces the chance > > of forgetting of_node_put(), and also simplifies error handling path. > > I not able to test the changes on all the hardwares, so driver owners, > > please help review when you have time. > > > > This patchset was inspired from Dan's comments on pinctrl-scmi-imx.c, > > thanks. > > > > Signed-off-by: Peng Fan <peng.fan@nxp.com> > > Andy's question about code generation on a related patch made me wonder, > too. > > On arm32, a conversion to for_each_child_of_node_scoped() seems to cost ca. > 48 bytes of additional code, regardless of whether there were explicit > cleanups before or not. > > I checked "pinctrl: renesas: Use scope based of_node_put() cleanups", and all > but the conversions in *_dt_node_to_map() cost 48 bytes each. > I am not sure this is an issue or else. What would you suggest me to do? If you think extra 48bytes consumption is not good here, feel free to drop the patch. Thanks, Peng. > Gr{oetje,eeting}s, > > Geert > > -- > Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux- > m68k.org > > In personal conversations with technical people, I call myself a hacker. But > when I'm talking to journalists I just say "programmer" or something like that. > -- Linus Torvalds
Hi Peng, On Fri, May 31, 2024 at 5:07 AM Peng Fan <peng.fan@nxp.com> wrote: > > Subject: Re: [PATCH v2 00/20] pinctrl: Use scope based of_node_put() > > cleanups > > On Sat, May 4, 2024 at 3:12 PM Peng Fan (OSS) <peng.fan@oss.nxp.com> > > wrote: > > > Use scope based of_node_put() to simplify code. It reduces the chance > > > of forgetting of_node_put(), and also simplifies error handling path. > > > I not able to test the changes on all the hardwares, so driver owners, > > > please help review when you have time. > > > > > > This patchset was inspired from Dan's comments on pinctrl-scmi-imx.c, > > > thanks. > > > > > > Signed-off-by: Peng Fan <peng.fan@nxp.com> > > > > Andy's question about code generation on a related patch made me wonder, > > too. > > > > On arm32, a conversion to for_each_child_of_node_scoped() seems to cost ca. > > 48 bytes of additional code, regardless of whether there were explicit > > cleanups before or not. > > > > I checked "pinctrl: renesas: Use scope based of_node_put() cleanups", and all > > but the conversions in *_dt_node_to_map() cost 48 bytes each. > > I am not sure this is an issue or else. What would you suggest me to do? > If you think extra 48bytes consumption is not good here, feel free to drop the > patch. I suggest doing nothing about this. I just wanted people to be aware of the impact. I guess it's just part of the slow but steady increase of kernel size (ca. 20-30 KiB/release)... ;-) Gr{oetje,eeting}s, Geert
Use scope based of_node_put() to simplify code. It reduces the chance of forgetting of_node_put(), and also simplifies error handling path. I not able to test the changes on all the hardwares, so driver owners, please help review when you have time. This patchset was inspired from Dan's comments on pinctrl-scmi-imx.c, thanks. Signed-off-by: Peng Fan <peng.fan@nxp.com> --- Changes in v2: - Drop aspeed changes per Andrew Jeffery - Drop changes to code pattern that of_node_get(or other refcount increasing) followed by of_node_put. That said, but I still have a change for samsung pinctrl that drops several of_node_put places. If this is not welcomed, patch 20/20 could be dropped. - Add Fix tag for patch 1 - Add A-b for patch 4 - Drop unneeded {} in patch 8 Per Dan Carpenter - Add a new patch 18. - Moved patch [19,20]/20, in case people are not happy with the changes, the two patch could be dropped when apply if no v3 patchset. - Link to v1: https://lore.kernel.org/r/20240501-pinctrl-cleanup-v1-0-797ceca46e5c@nxp.com --- Peng Fan (20): pinctrl: ti: iodelay: Use scope based of_node_put() cleanups pinctrl: tegra: Use scope based of_node_put() cleanups pinctrl: stm32: Use scope based of_node_put() cleanups pinctrl: starfive: Use scope based of_node_put() cleanups pinctrl: sprd: Use scope based of_node_put() cleanups pinctrl: spear: Use scope based of_node_put() cleanups pinctrl: renesas: Use scope based of_node_put() cleanups pinctrl: st: Use scope based of_node_put() cleanups pinctrl: rockchip: Use scope based of_node_put() cleanups pinctrl: equilibrium: Use scope based of_node_put() cleanups pinctrl: at91: Use scope based of_node_put() cleanups pinctrl: s32cc: Use scope based of_node_put() cleanups pinctrl: nomadik: Use scope based of_node_put() cleanups pinctrl: mediatek: Use scope based of_node_put() cleanups pinctrl: freescale: Use scope based of_node_put() cleanups pinctrl: bcm: bcm63xx: Use scope based of_node_put() cleanups pinctrl: pinconf-generic: Use scope based of_node_put() cleanups pinctrl: freescale: mxs: Fix refcount of child pinctrl: k210: Use scope based of_node_put() cleanups pinctrl: samsung: Use scope based of_node_put() cleanups drivers/pinctrl/bcm/pinctrl-bcm63xx.c | 4 +-- drivers/pinctrl/freescale/pinctrl-imx.c | 25 ++++----------- drivers/pinctrl/freescale/pinctrl-imx1-core.c | 16 +++------- drivers/pinctrl/freescale/pinctrl-mxs.c | 18 ++++------- drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 4 +-- drivers/pinctrl/mediatek/pinctrl-paris.c | 4 +-- drivers/pinctrl/nomadik/pinctrl-abx500.c | 4 +-- drivers/pinctrl/nomadik/pinctrl-nomadik.c | 4 +-- drivers/pinctrl/nxp/pinctrl-s32cc.c | 31 ++++++------------ drivers/pinctrl/pinconf-generic.c | 7 ++-- drivers/pinctrl/pinctrl-at91-pio4.c | 7 ++-- drivers/pinctrl/pinctrl-at91.c | 14 +++----- drivers/pinctrl/pinctrl-equilibrium.c | 21 +++--------- drivers/pinctrl/pinctrl-k210.c | 7 ++-- drivers/pinctrl/pinctrl-rockchip.c | 11 ++----- drivers/pinctrl/pinctrl-st.c | 37 +++++++--------------- drivers/pinctrl/renesas/pinctrl-rza1.c | 14 +++----- drivers/pinctrl/renesas/pinctrl-rzg2l.c | 7 ++-- drivers/pinctrl/renesas/pinctrl-rzn1.c | 23 ++++---------- drivers/pinctrl/renesas/pinctrl-rzv2m.c | 7 ++-- drivers/pinctrl/renesas/pinctrl.c | 7 ++-- drivers/pinctrl/samsung/pinctrl-exynos.c | 16 +++------- drivers/pinctrl/samsung/pinctrl-samsung.c | 19 +++-------- drivers/pinctrl/spear/pinctrl-spear.c | 13 +++----- drivers/pinctrl/sprd/pinctrl-sprd.c | 14 +++----- drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c | 27 +++++++--------- drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c | 18 +++++------ drivers/pinctrl/stm32/pinctrl-stm32.c | 4 +-- drivers/pinctrl/tegra/pinctrl-tegra-xusb.c | 7 ++-- drivers/pinctrl/tegra/pinctrl-tegra.c | 4 +-- drivers/pinctrl/ti/pinctrl-ti-iodelay.c | 37 ++++++++-------------- 31 files changed, 133 insertions(+), 298 deletions(-) --- base-commit: bb7a2467e6beef44a80a17d45ebf2931e7631083 change-id: 20240429-pinctrl-cleanup-e4d461c32648 Best regards,