| Message ID | 20210323131728.2702789-1-arnd@kernel.org |
|---|---|
| State | New |
| Headers | show |
| Series | pinctrl: qcom: fix unintentional string concatenation | expand |
On Tue 23 Mar 08:17 CDT 2021, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@arndb.de> > > clang is clearly correct to point out a typo in a silly > array of strings: > > drivers/pinctrl/qcom/pinctrl-sdx55.c:426:61: error: suspicious concatenation of string literals in an array initialization; did you mean to separate the elements with a comma? [-Werror,-Wstring-concatenation] > "gpio14", "gpio15", "gpio16", "gpio17", "gpio18", "gpio19" "gpio20", "gpio21", "gpio22", > ^ > Add the missing comma that must have accidentally been removed. That's certainly a useful warning! Thanks Arnd. Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org> Regards, Bjorn > > Fixes: ac43c44a7a37 ("pinctrl: qcom: Add SDX55 pincontrol driver") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > drivers/pinctrl/qcom/pinctrl-sdx55.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/pinctrl/qcom/pinctrl-sdx55.c b/drivers/pinctrl/qcom/pinctrl-sdx55.c > index 2b5b0e2b03ad..5aaf57b40407 100644 > --- a/drivers/pinctrl/qcom/pinctrl-sdx55.c > +++ b/drivers/pinctrl/qcom/pinctrl-sdx55.c > @@ -423,7 +423,7 @@ static const char * const gpio_groups[] = { > > static const char * const qdss_stm_groups[] = { > "gpio0", "gpio1", "gpio2", "gpio3", "gpio4", "gpio5", "gpio6", "gpio7", "gpio12", "gpio13", > - "gpio14", "gpio15", "gpio16", "gpio17", "gpio18", "gpio19" "gpio20", "gpio21", "gpio22", > + "gpio14", "gpio15", "gpio16", "gpio17", "gpio18", "gpio19", "gpio20", "gpio21", "gpio22", > "gpio23", "gpio44", "gpio45", "gpio52", "gpio53", "gpio56", "gpio57", "gpio61", "gpio62", > "gpio63", "gpio64", "gpio65", "gpio66", > }; > -- > 2.29.2 >
On Tue, Mar 23, 2021 at 02:17:13PM +0100, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@arndb.de> > > clang is clearly correct to point out a typo in a silly > array of strings: > > drivers/pinctrl/qcom/pinctrl-sdx55.c:426:61: error: suspicious concatenation of string literals in an array initialization; did you mean to separate the elements with a comma? [-Werror,-Wstring-concatenation] > "gpio14", "gpio15", "gpio16", "gpio17", "gpio18", "gpio19" "gpio20", "gpio21", "gpio22", > ^ > Add the missing comma that must have accidentally been removed. > > Fixes: ac43c44a7a37 ("pinctrl: qcom: Add SDX55 pincontrol driver") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Reviewed-by: Nathan Chancellor <nathan@kernel.org> > --- > drivers/pinctrl/qcom/pinctrl-sdx55.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/pinctrl/qcom/pinctrl-sdx55.c b/drivers/pinctrl/qcom/pinctrl-sdx55.c > index 2b5b0e2b03ad..5aaf57b40407 100644 > --- a/drivers/pinctrl/qcom/pinctrl-sdx55.c > +++ b/drivers/pinctrl/qcom/pinctrl-sdx55.c > @@ -423,7 +423,7 @@ static const char * const gpio_groups[] = { > > static const char * const qdss_stm_groups[] = { > "gpio0", "gpio1", "gpio2", "gpio3", "gpio4", "gpio5", "gpio6", "gpio7", "gpio12", "gpio13", > - "gpio14", "gpio15", "gpio16", "gpio17", "gpio18", "gpio19" "gpio20", "gpio21", "gpio22", > + "gpio14", "gpio15", "gpio16", "gpio17", "gpio18", "gpio19", "gpio20", "gpio21", "gpio22", > "gpio23", "gpio44", "gpio45", "gpio52", "gpio53", "gpio56", "gpio57", "gpio61", "gpio62", > "gpio63", "gpio64", "gpio65", "gpio66", > }; > -- > 2.29.2 >
From: Arnd Bergmann > Sent: 23 March 2021 13:17 > clang is clearly correct to point out a typo in a silly > array of strings: > > drivers/pinctrl/qcom/pinctrl-sdx55.c:426:61: error: suspicious concatenation of string literals in an > array initialization; did you mean to separate the elements with a comma? [-Werror,-Wstring- > concatenation] > "gpio14", "gpio15", "gpio16", "gpio17", "gpio18", "gpio19" "gpio20", "gpio21", "gpio22", > ^ > Add the missing comma that must have accidentally been removed. > > Fixes: ac43c44a7a37 ("pinctrl: qcom: Add SDX55 pincontrol driver") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > drivers/pinctrl/qcom/pinctrl-sdx55.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/pinctrl/qcom/pinctrl-sdx55.c b/drivers/pinctrl/qcom/pinctrl-sdx55.c > index 2b5b0e2b03ad..5aaf57b40407 100644 > --- a/drivers/pinctrl/qcom/pinctrl-sdx55.c > +++ b/drivers/pinctrl/qcom/pinctrl-sdx55.c > @@ -423,7 +423,7 @@ static const char * const gpio_groups[] = { > > static const char * const qdss_stm_groups[] = { > "gpio0", "gpio1", "gpio2", "gpio3", "gpio4", "gpio5", "gpio6", "gpio7", "gpio12", "gpio13", > - "gpio14", "gpio15", "gpio16", "gpio17", "gpio18", "gpio19" "gpio20", "gpio21", "gpio22", > + "gpio14", "gpio15", "gpio16", "gpio17", "gpio18", "gpio19", "gpio20", "gpio21", "gpio22", > "gpio23", "gpio44", "gpio45", "gpio52", "gpio53", "gpio56", "gpio57", "gpio61", "gpio62", > "gpio63", "gpio64", "gpio65", "gpio66", That may be replaceable with: static const char qdss_stm_groups[][8] = { .... }; For a code and data size reduction. David - Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK Registration No: 1397386 (Wales)
On Tue, Mar 23, 2021 at 2:17 PM Arnd Bergmann <arnd@kernel.org> wrote: > From: Arnd Bergmann <arnd@arndb.de> > > clang is clearly correct to point out a typo in a silly > array of strings: > > drivers/pinctrl/qcom/pinctrl-sdx55.c:426:61: error: suspicious concatenation of string literals in an array initialization; did you mean to separate the elements with a comma? [-Werror,-Wstring-concatenation] > "gpio14", "gpio15", "gpio16", "gpio17", "gpio18", "gpio19" "gpio20", "gpio21", "gpio22", > ^ > Add the missing comma that must have accidentally been removed. > > Fixes: ac43c44a7a37 ("pinctrl: qcom: Add SDX55 pincontrol driver") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Patch applied. Yours, Linus Walleij
Hello: This patch was applied to qcom/linux.git (refs/heads/for-next): On Tue, 23 Mar 2021 14:17:13 +0100 you wrote: > From: Arnd Bergmann <arnd@arndb.de> > > clang is clearly correct to point out a typo in a silly > array of strings: > > drivers/pinctrl/qcom/pinctrl-sdx55.c:426:61: error: suspicious concatenation of string literals in an array initialization; did you mean to separate the elements with a comma? [-Werror,-Wstring-concatenation] > "gpio14", "gpio15", "gpio16", "gpio17", "gpio18", "gpio19" "gpio20", "gpio21", "gpio22", > ^ > Add the missing comma that must have accidentally been removed. > > [...] Here is the summary with links: - pinctrl: qcom: fix unintentional string concatenation https://git.kernel.org/qcom/c/58b5ada8c465 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/drivers/pinctrl/qcom/pinctrl-sdx55.c b/drivers/pinctrl/qcom/pinctrl-sdx55.c index 2b5b0e2b03ad..5aaf57b40407 100644 --- a/drivers/pinctrl/qcom/pinctrl-sdx55.c +++ b/drivers/pinctrl/qcom/pinctrl-sdx55.c @@ -423,7 +423,7 @@ static const char * const gpio_groups[] = { static const char * const qdss_stm_groups[] = { "gpio0", "gpio1", "gpio2", "gpio3", "gpio4", "gpio5", "gpio6", "gpio7", "gpio12", "gpio13", - "gpio14", "gpio15", "gpio16", "gpio17", "gpio18", "gpio19" "gpio20", "gpio21", "gpio22", + "gpio14", "gpio15", "gpio16", "gpio17", "gpio18", "gpio19", "gpio20", "gpio21", "gpio22", "gpio23", "gpio44", "gpio45", "gpio52", "gpio53", "gpio56", "gpio57", "gpio61", "gpio62", "gpio63", "gpio64", "gpio65", "gpio66", };