From: Andy Shevchenko <andriy.shevchenko@linux.intel.com> To: "Linus Walleij" <linus.walleij@linaro.org>, "Bartosz Golaszewski" <bartosz.golaszewski@linaro.org>, "Andy Shevchenko" <andriy.shevchenko@linux.intel.com>, "Rasmus Villemoes" <linux@rasmusvillemoes.dk>, "Jonathan Neuschäfer" <j.neuschaefer@gmx.net>, "Krzysztof Kozlowski" <krzysztof.kozlowski@linaro.org>, "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>, "Geert Uytterhoeven" <geert+renesas@glider.be>, "Biju Das" <biju.das.jz@bp.renesas.com>, "Claudiu Beznea" <claudiu.beznea.uj@bp.renesas.com>, "Jianlong Huang" <jianlong.huang@starfivetech.com>, linux-arm-kernel@lists.infradead.org, linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org, openbmc@lists.ozlabs.org, linux-mips@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-renesas-soc@vger.kernel.org Cc: Ray Jui <rjui@broadcom.com>, Scott Branden <sbranden@broadcom.com>, Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>, 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>, Sascha Hauer <s.hauer@pengutronix.de>, NXP Linux Team <linux-imx@nxp.com>, Sean Wang <sean.wang@kernel.org>, Paul Cercueil <paul@crapouillou.net>, Lakshmi Sowjanya D <lakshmi.sowjanya.d@intel.com>, Andy Gross <agross@kernel.org>, Bjorn Andersson <andersson@kernel.org>, Konrad Dybcio <konrad.dybcio@linaro.org>, Emil Renner Berthing <kernel@esmil.dk>, Hal Feng <hal.feng@starfivetech.com> Subject: [PATCH v2 15/21] pinctrl: imx: Convert to use grp member Date: Thu, 23 Nov 2023 21:31:43 +0200 [thread overview] Message-ID: <20231123193355.3400852-16-andriy.shevchenko@linux.intel.com> (raw) In-Reply-To: <20231123193355.3400852-1-andriy.shevchenko@linux.intel.com> Convert drivers to use grp member embedded in struct group_desc. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- drivers/pinctrl/freescale/pinctrl-imx.c | 31 +++++++++++-------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/drivers/pinctrl/freescale/pinctrl-imx.c b/drivers/pinctrl/freescale/pinctrl-imx.c index 9099a7c81d4a..4245189b59a5 100644 --- a/drivers/pinctrl/freescale/pinctrl-imx.c +++ b/drivers/pinctrl/freescale/pinctrl-imx.c @@ -42,7 +42,7 @@ static inline const struct group_desc *imx_pinctrl_find_group_by_name( for (i = 0; i < pctldev->num_groups; i++) { grp = pinctrl_generic_get_group(pctldev, i); - if (grp && !strcmp(grp->name, name)) + if (grp && !strcmp(grp->grp.name, name)) break; } @@ -79,9 +79,9 @@ static int imx_dt_node_to_map(struct pinctrl_dev *pctldev, } if (info->flags & IMX_USE_SCU) { - map_num += grp->num_pins; + map_num += grp->grp.npins; } else { - for (i = 0; i < grp->num_pins; i++) { + for (i = 0; i < grp->grp.npins; i++) { pin = &((struct imx_pin *)(grp->data))[i]; if (!(pin->conf.mmio.config & IMX_NO_PAD_CTL)) map_num++; @@ -109,7 +109,7 @@ static int imx_dt_node_to_map(struct pinctrl_dev *pctldev, /* create config map */ new_map++; - for (i = j = 0; i < grp->num_pins; i++) { + for (i = j = 0; i < grp->grp.npins; i++) { pin = &((struct imx_pin *)(grp->data))[i]; /* @@ -263,10 +263,10 @@ static int imx_pmx_set(struct pinctrl_dev *pctldev, unsigned selector, if (!func) return -EINVAL; - npins = grp->num_pins; + npins = grp->grp.npins; dev_dbg(ipctl->dev, "enable function %s group %s\n", - func->name, grp->name); + func->name, grp->grp.name); for (i = 0; i < npins; i++) { /* @@ -423,7 +423,7 @@ static void imx_pinconf_group_dbg_show(struct pinctrl_dev *pctldev, if (!grp) return; - for (i = 0; i < grp->num_pins; i++) { + for (i = 0; i < grp->grp.npins; i++) { struct imx_pin *pin = &((struct imx_pin *)(grp->data))[i]; name = pin_get_name(pctldev, pin->pin); @@ -526,7 +526,7 @@ static int imx_pinctrl_parse_groups(struct device_node *np, pin_size = FSL_PIN_SIZE; /* Initialise group */ - grp->name = np->name; + grp->grp.name = np->name; /* * the binding format is fsl,pins = <PIN_FUNC_ID CONFIG ...>, @@ -554,19 +554,17 @@ static int imx_pinctrl_parse_groups(struct device_node *np, return -EINVAL; } - grp->num_pins = size / pin_size; - grp->data = devm_kcalloc(ipctl->dev, - grp->num_pins, sizeof(struct imx_pin), - GFP_KERNEL); + grp->grp.npins = size / pin_size; + grp->data = devm_kcalloc(ipctl->dev, grp->grp.npins, sizeof(*pin), GFP_KERNEL); if (!grp->data) return -ENOMEM; - pins = devm_kcalloc(ipctl->dev, grp->num_pins, sizeof(*pins), GFP_KERNEL); + pins = devm_kcalloc(ipctl->dev, grp->grp.npins, sizeof(*pins), GFP_KERNEL); if (!pins) return -ENOMEM; - grp->pins = pins; + grp->grp.pins = pins; - for (i = 0; i < grp->num_pins; i++) { + for (i = 0; i < grp->grp.npins; i++) { pin = &((struct imx_pin *)(grp->data))[i]; if (info->flags & IMX_USE_SCU) info->imx_pinctrl_parse_pin(ipctl, &pins[i], pin, &list); @@ -613,8 +611,7 @@ static int imx_pinctrl_parse_functions(struct device_node *np, i = 0; for_each_child_of_node(np, child) { - grp = devm_kzalloc(ipctl->dev, sizeof(struct group_desc), - GFP_KERNEL); + grp = devm_kzalloc(ipctl->dev, sizeof(*grp), GFP_KERNEL); if (!grp) { of_node_put(child); return -ENOMEM; -- 2.43.0.rc1.1.gbec44491f096
WARNING: multiple messages have this Message-ID (diff)
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com> To: "Linus Walleij" <linus.walleij@linaro.org>, "Bartosz Golaszewski" <bartosz.golaszewski@linaro.org>, "Andy Shevchenko" <andriy.shevchenko@linux.intel.com>, "Rasmus Villemoes" <linux@rasmusvillemoes.dk>, "Jonathan Neuschäfer" <j.neuschaefer@gmx.net>, "Krzysztof Kozlowski" <krzysztof.kozlowski@linaro.org>, "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>, "Geert Uytterhoeven" <geert+renesas@glider.be>, "Biju Das" <biju.das.jz@bp.renesas.com>, "Claudiu Beznea" <claudiu.beznea.uj@bp.renesas.com>, "Jianlong Huang" <jianlong.huang@starfivetech.com>, linux-arm-kernel@lists.infradead.org, linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org, openbmc@lists.ozlabs.org, linux-mips@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-renesas-soc@vger.kernel.org Cc: Ray Jui <rjui@broadcom.com>, Scott Branden <sbranden@broadcom.com>, Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>, 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>, Sascha Hauer <s.hauer@pengutronix.de>, NXP Linux Team <linux-imx@nxp.com>, Sean Wang <sean.wang@kernel.org>, Paul Cercueil <paul@crapouillou.net>, Lakshmi Sowjanya D <lakshmi.sowjanya.d@intel.com>, Andy Gross <agross@kernel.org>, Bjorn Andersson <andersson@kernel.org>, Konrad Dybcio <konrad.dybcio@linaro.org>, Emil Renner Berthing <kernel@esmil.dk>, Hal Feng <hal.feng@starfivetech.com> Subject: [PATCH v2 15/21] pinctrl: imx: Convert to use grp member Date: Thu, 23 Nov 2023 21:31:43 +0200 [thread overview] Message-ID: <20231123193355.3400852-16-andriy.shevchenko@linux.intel.com> (raw) In-Reply-To: <20231123193355.3400852-1-andriy.shevchenko@linux.intel.com> Convert drivers to use grp member embedded in struct group_desc. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- drivers/pinctrl/freescale/pinctrl-imx.c | 31 +++++++++++-------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/drivers/pinctrl/freescale/pinctrl-imx.c b/drivers/pinctrl/freescale/pinctrl-imx.c index 9099a7c81d4a..4245189b59a5 100644 --- a/drivers/pinctrl/freescale/pinctrl-imx.c +++ b/drivers/pinctrl/freescale/pinctrl-imx.c @@ -42,7 +42,7 @@ static inline const struct group_desc *imx_pinctrl_find_group_by_name( for (i = 0; i < pctldev->num_groups; i++) { grp = pinctrl_generic_get_group(pctldev, i); - if (grp && !strcmp(grp->name, name)) + if (grp && !strcmp(grp->grp.name, name)) break; } @@ -79,9 +79,9 @@ static int imx_dt_node_to_map(struct pinctrl_dev *pctldev, } if (info->flags & IMX_USE_SCU) { - map_num += grp->num_pins; + map_num += grp->grp.npins; } else { - for (i = 0; i < grp->num_pins; i++) { + for (i = 0; i < grp->grp.npins; i++) { pin = &((struct imx_pin *)(grp->data))[i]; if (!(pin->conf.mmio.config & IMX_NO_PAD_CTL)) map_num++; @@ -109,7 +109,7 @@ static int imx_dt_node_to_map(struct pinctrl_dev *pctldev, /* create config map */ new_map++; - for (i = j = 0; i < grp->num_pins; i++) { + for (i = j = 0; i < grp->grp.npins; i++) { pin = &((struct imx_pin *)(grp->data))[i]; /* @@ -263,10 +263,10 @@ static int imx_pmx_set(struct pinctrl_dev *pctldev, unsigned selector, if (!func) return -EINVAL; - npins = grp->num_pins; + npins = grp->grp.npins; dev_dbg(ipctl->dev, "enable function %s group %s\n", - func->name, grp->name); + func->name, grp->grp.name); for (i = 0; i < npins; i++) { /* @@ -423,7 +423,7 @@ static void imx_pinconf_group_dbg_show(struct pinctrl_dev *pctldev, if (!grp) return; - for (i = 0; i < grp->num_pins; i++) { + for (i = 0; i < grp->grp.npins; i++) { struct imx_pin *pin = &((struct imx_pin *)(grp->data))[i]; name = pin_get_name(pctldev, pin->pin); @@ -526,7 +526,7 @@ static int imx_pinctrl_parse_groups(struct device_node *np, pin_size = FSL_PIN_SIZE; /* Initialise group */ - grp->name = np->name; + grp->grp.name = np->name; /* * the binding format is fsl,pins = <PIN_FUNC_ID CONFIG ...>, @@ -554,19 +554,17 @@ static int imx_pinctrl_parse_groups(struct device_node *np, return -EINVAL; } - grp->num_pins = size / pin_size; - grp->data = devm_kcalloc(ipctl->dev, - grp->num_pins, sizeof(struct imx_pin), - GFP_KERNEL); + grp->grp.npins = size / pin_size; + grp->data = devm_kcalloc(ipctl->dev, grp->grp.npins, sizeof(*pin), GFP_KERNEL); if (!grp->data) return -ENOMEM; - pins = devm_kcalloc(ipctl->dev, grp->num_pins, sizeof(*pins), GFP_KERNEL); + pins = devm_kcalloc(ipctl->dev, grp->grp.npins, sizeof(*pins), GFP_KERNEL); if (!pins) return -ENOMEM; - grp->pins = pins; + grp->grp.pins = pins; - for (i = 0; i < grp->num_pins; i++) { + for (i = 0; i < grp->grp.npins; i++) { pin = &((struct imx_pin *)(grp->data))[i]; if (info->flags & IMX_USE_SCU) info->imx_pinctrl_parse_pin(ipctl, &pins[i], pin, &list); @@ -613,8 +611,7 @@ static int imx_pinctrl_parse_functions(struct device_node *np, i = 0; for_each_child_of_node(np, child) { - grp = devm_kzalloc(ipctl->dev, sizeof(struct group_desc), - GFP_KERNEL); + grp = devm_kzalloc(ipctl->dev, sizeof(*grp), GFP_KERNEL); if (!grp) { of_node_put(child); return -ENOMEM; -- 2.43.0.rc1.1.gbec44491f096 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2023-11-23 19:34 UTC|newest] Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-11-23 19:31 [PATCH v2 00/21] pinctrl: Convert struct group_desc to use struct pingroup Andy Shevchenko 2023-11-23 19:31 ` Andy Shevchenko 2023-11-23 19:31 ` [PATCH v2 01/21] pinctrl: qcom: lpass-lpi: Replace kernel.h with what is being used Andy Shevchenko 2023-11-23 19:31 ` Andy Shevchenko 2023-11-23 19:31 ` [PATCH v2 02/21] pinctrl: qcom: lpass-lpi: Remove unused member in struct lpi_pingroup Andy Shevchenko 2023-11-23 19:31 ` Andy Shevchenko 2023-11-23 19:31 ` [PATCH v2 03/21] pinctrl: equilibrium: Use temporary variable to hold pins Andy Shevchenko 2023-11-23 19:31 ` Andy Shevchenko 2023-11-23 19:31 ` [PATCH v2 04/21] pinctrl: imx: " Andy Shevchenko 2023-11-23 19:31 ` Andy Shevchenko 2023-11-23 19:31 ` [PATCH v2 05/21] pinctrl: core: Make pins const in struct group_desc Andy Shevchenko 2023-11-23 19:31 ` Andy Shevchenko 2023-11-23 19:31 ` [PATCH v2 06/21] pinctrl: equilibrium: Convert to use struct pingroup Andy Shevchenko 2023-11-23 19:31 ` Andy Shevchenko 2023-11-24 13:19 ` kernel test robot 2023-11-24 13:19 ` kernel test robot 2023-11-24 14:30 ` Andy Shevchenko 2023-11-24 14:30 ` Andy Shevchenko 2023-11-23 19:31 ` [PATCH v2 07/21] pinctrl: keembay: " Andy Shevchenko 2023-11-23 19:31 ` Andy Shevchenko 2023-11-23 19:31 ` [PATCH v2 08/21] pinctrl: nuvoton: Convert to use struct pingroup and PINCTRL_PINGROUP() Andy Shevchenko 2023-11-23 19:31 ` Andy Shevchenko 2023-11-23 19:31 ` [PATCH v2 09/21] pinctrl: core: Add a convenient define PINCTRL_GROUP_DESC() Andy Shevchenko 2023-11-23 19:31 ` Andy Shevchenko 2023-11-23 19:31 ` [PATCH v2 10/21] pinctrl: ingenic: Make use of PINCTRL_GROUP_DESC() Andy Shevchenko 2023-11-23 19:31 ` Andy Shevchenko 2023-11-23 19:31 ` [PATCH v2 11/21] pinctrl: mediatek: " Andy Shevchenko 2023-11-23 19:31 ` Andy Shevchenko 2023-11-23 19:31 ` [PATCH v2 12/21] pinctrl: core: Embed struct pingroup into struct group_desc Andy Shevchenko 2023-11-23 19:31 ` Andy Shevchenko 2023-11-24 23:39 ` kernel test robot 2023-11-24 23:39 ` kernel test robot 2023-11-28 15:53 ` Andy Shevchenko 2023-11-28 15:53 ` Andy Shevchenko 2023-11-28 15:58 ` Andy Shevchenko 2023-11-28 15:58 ` Andy Shevchenko 2023-11-23 19:31 ` [PATCH v2 13/21] pinctrl: bcm: Convert to use grp member Andy Shevchenko 2023-11-23 19:31 ` Andy Shevchenko 2023-11-28 3:49 ` Florian Fainelli 2023-11-28 3:49 ` Florian Fainelli 2023-11-23 19:31 ` [PATCH v2 14/21] pinctrl: equilibrium: " Andy Shevchenko 2023-11-23 19:31 ` Andy Shevchenko 2023-11-23 19:31 ` Andy Shevchenko [this message] 2023-11-23 19:31 ` [PATCH v2 15/21] pinctrl: imx: " Andy Shevchenko 2023-11-23 19:31 ` [PATCH v2 16/21] pinctrl: ingenic: " Andy Shevchenko 2023-11-23 19:31 ` Andy Shevchenko 2023-11-24 11:10 ` Paul Cercueil 2023-11-24 11:10 ` Paul Cercueil 2023-11-23 19:31 ` [PATCH v2 17/21] pinctrl: keembay: " Andy Shevchenko 2023-11-23 19:31 ` Andy Shevchenko 2023-11-23 19:31 ` [PATCH v2 18/21] pinctrl: mediatek: " Andy Shevchenko 2023-11-23 19:31 ` Andy Shevchenko 2023-11-23 19:31 ` [PATCH v2 19/21] pinctrl: renesas: " Andy Shevchenko 2023-11-23 19:31 ` Andy Shevchenko 2023-11-23 19:31 ` [PATCH v2 20/21] pinctrl: starfive: " Andy Shevchenko 2023-11-23 19:31 ` Andy Shevchenko 2023-11-26 19:58 ` Emil Renner Berthing 2023-11-26 19:58 ` Emil Renner Berthing 2023-11-23 19:31 ` [PATCH v2 21/21] pinctrl: core: Remove unused members from struct group_desc Andy Shevchenko 2023-11-23 19:31 ` Andy Shevchenko 2023-11-24 10:17 ` [PATCH v2 00/21] pinctrl: Convert struct group_desc to use struct pingroup Linus Walleij 2023-11-24 10:17 ` Linus Walleij 2023-11-24 14:47 ` Andy Shevchenko 2023-11-24 14:47 ` Andy Shevchenko
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=20231123193355.3400852-16-andriy.shevchenko@linux.intel.com \ --to=andriy.shevchenko@linux.intel.com \ --cc=agross@kernel.org \ --cc=aisheng.dong@nxp.com \ --cc=andersson@kernel.org \ --cc=bartosz.golaszewski@linaro.org \ --cc=bcm-kernel-feedback-list@broadcom.com \ --cc=biju.das.jz@bp.renesas.com \ --cc=claudiu.beznea.uj@bp.renesas.com \ --cc=festevam@gmail.com \ --cc=geert+renesas@glider.be \ --cc=hal.feng@starfivetech.com \ --cc=j.neuschaefer@gmx.net \ --cc=jianlong.huang@starfivetech.com \ --cc=kernel@esmil.dk \ --cc=kernel@pengutronix.de \ --cc=konrad.dybcio@linaro.org \ --cc=krzysztof.kozlowski@linaro.org \ --cc=lakshmi.sowjanya.d@intel.com \ --cc=linus.walleij@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-arm-msm@vger.kernel.org \ --cc=linux-gpio@vger.kernel.org \ --cc=linux-imx@nxp.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mediatek@lists.infradead.org \ --cc=linux-mips@vger.kernel.org \ --cc=linux-renesas-soc@vger.kernel.org \ --cc=linux@rasmusvillemoes.dk \ --cc=openbmc@lists.ozlabs.org \ --cc=paul@crapouillou.net \ --cc=ping.bai@nxp.com \ --cc=rjui@broadcom.com \ --cc=s.hauer@pengutronix.de \ --cc=sbranden@broadcom.com \ --cc=sean.wang@kernel.org \ --cc=shawnguo@kernel.org \ --cc=u.kleine-koenig@pengutronix.de \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.