From: "Rafał Miłecki" <zajec5@gmail.com>
To: Linus Walleij <linus.walleij@linaro.org>
Cc: "Dong Aisheng" <aisheng.dong@nxp.com>,
"Fabio Estevam" <festevam@gmail.com>,
"Shawn Guo" <shawnguo@kernel.org>,
"Stefan Agner" <stefan@agner.ch>,
"Pengutronix Kernel Team" <kernel@pengutronix.de>,
"Sascha Hauer" <s.hauer@pengutronix.de>,
"NXP Linux Team" <linux-imx@nxp.com>,
"Lakshmi Sowjanya D" <lakshmi.sowjanya.d@intel.com>,
linux-gpio@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
"Rafał Miłecki" <rafal@milecki.pl>
Subject: [PATCH V2 1/4] pinctrl: imx: prepare for making "group_names" in "function_desc" const
Date: Thu, 16 Dec 2021 17:22:03 +0100 [thread overview]
Message-ID: <20211216162206.8027-1-zajec5@gmail.com> (raw)
From: Rafał Miłecki <rafal@milecki.pl>
The plan for "struct function_desc" is to make its "group_names"
/double/ const. That will allow drivers to use it with static const
data.
This imx change is required to avoid:
drivers/pinctrl/freescale/pinctrl-imx.c: In function 'imx_pinctrl_parse_functions':
drivers/pinctrl/freescale/pinctrl-imx.c:672:24: error: assignment of read-only location '*(func->group_names + (sizetype)(i * 4))'
672 | func->group_names[i] = child->name;
| ^
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
---
drivers/pinctrl/freescale/pinctrl-imx.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/drivers/pinctrl/freescale/pinctrl-imx.c b/drivers/pinctrl/freescale/pinctrl-imx.c
index daf28bc5661d..47b2ab1a14d0 100644
--- a/drivers/pinctrl/freescale/pinctrl-imx.c
+++ b/drivers/pinctrl/freescale/pinctrl-imx.c
@@ -648,6 +648,7 @@ static int imx_pinctrl_parse_functions(struct device_node *np,
struct device_node *child;
struct function_desc *func;
struct group_desc *grp;
+ const char **group_names;
u32 i = 0;
dev_dbg(pctl->dev, "parse function(%d): %pOFn\n", index, np);
@@ -663,14 +664,16 @@ static int imx_pinctrl_parse_functions(struct device_node *np,
dev_err(ipctl->dev, "no groups defined in %pOF\n", np);
return -EINVAL;
}
- func->group_names = devm_kcalloc(ipctl->dev, func->num_group_names,
- sizeof(char *), GFP_KERNEL);
+
+ group_names = devm_kcalloc(ipctl->dev, func->num_group_names,
+ sizeof(char *), GFP_KERNEL);
if (!func->group_names)
return -ENOMEM;
+ for_each_child_of_node(np, child)
+ group_names[i] = child->name;
+ func->group_names = group_names;
for_each_child_of_node(np, child) {
- func->group_names[i] = child->name;
-
grp = devm_kzalloc(ipctl->dev, sizeof(struct group_desc),
GFP_KERNEL);
if (!grp) {
--
2.31.1
next reply other threads:[~2021-12-16 16:22 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-16 16:22 Rafał Miłecki [this message]
2021-12-16 16:22 ` [PATCH V2 2/4] pinctrl: keembay: comment process of building functions a bit Rafał Miłecki
2021-12-16 16:22 ` [PATCH V2 3/4] pinctrl: keembay: rework loops looking for groups names Rafał Miłecki
2021-12-16 16:22 ` [PATCH V2 4/4] pinctrl: add one more "const" for generic function groups Rafał Miłecki
2022-01-11 15:34 ` Nathan Chancellor
2022-01-11 16:51 ` Rafał Miłecki
2022-01-16 0:51 ` Linus Walleij
2022-01-18 7:02 ` Uwe Kleine-König
2022-01-18 7:21 ` Rafał Miłecki
2022-01-18 7:31 ` Uwe Kleine-König
2021-12-17 9:39 ` [PATCH V2 1/4] pinctrl: imx: prepare for making "group_names" in "function_desc" const Andy Shevchenko
2021-12-22 1:58 ` Linus Walleij
2021-12-22 20:24 ` Abel Vesa
2022-01-01 23:55 ` Marcel Ziswiler
2022-01-01 23:58 ` Rafał Miłecki
2022-01-01 23:59 ` Marcel Ziswiler
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=20211216162206.8027-1-zajec5@gmail.com \
--to=zajec5@gmail.com \
--cc=aisheng.dong@nxp.com \
--cc=festevam@gmail.com \
--cc=kernel@pengutronix.de \
--cc=lakshmi.sowjanya.d@intel.com \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-imx@nxp.com \
--cc=rafal@milecki.pl \
--cc=s.hauer@pengutronix.de \
--cc=shawnguo@kernel.org \
--cc=stefan@agner.ch \
/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 NNTP newsgroup(s).