Skip to contentSkip to conversation

pinctrl: qcom: fix unintentional string concatenation

PATCH Applied Arnd Bergmann 6 participants 6 messages Mar 23, 2021 – May 26, 2021

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 pinctrl: qcom: fix unintentional string concatenation

From: Arnd Bergmann <[email protected]>

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")
---
 drivers/pinctrl/qcom/pinctrl-sdx55.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pinctrl/qcom/pinctrl-sdx55.c +1 -1
index 2b5b0e2b03ad..5aaf57b40407 100644
@@ -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",
 };
Signature · 1 line
2.29.2
Reviewed-by on v1 1/1
#1 lore raw
Quoted 9 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

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.

Regards,
Bjorn

Quoted 23 lines
Fixes ac43c44a7a37 ("pinctrl: qcom: Add SDX55 pincontrol driver")
---
 drivers/pinctrl/qcom/pinctrl-sdx55.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pinctrl/qcom/pinctrl-sdx55.c +1 -1
index 2b5b0e2b03ad..5aaf57b40407 100644
@@ -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",
 };
Signature · 1 line
2.29.2
Reviewed-by on v1 1/1
#2 lore raw
In reply to Arnd Bergmann
Quoted 5 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

clang is clearly correct to point out a typo in a silly array of strings:

Quoted 7 lines

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")
Quoted 20 lines
---
 drivers/pinctrl/qcom/pinctrl-sdx55.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pinctrl/qcom/pinctrl-sdx55.c +1 -1
index 2b5b0e2b03ad..5aaf57b40407 100644
@@ -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",
 };
Signature · 1 line
2.29.2
#3 lore raw
In reply to Arnd Bergmann

From: Arnd Bergmann

Quoted 22 lines

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")
---
 drivers/pinctrl/qcom/pinctrl-sdx55.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pinctrl/qcom/pinctrl-sdx55.c +0 -0
index 2b5b0e2b03ad..5aaf57b40407 100644

drivers/pinctrl/qcom/pinctrl-sdx55.c static const char * const gpio_groups[] = { · line 428

Quoted 7 lines
drivers/pinctrl/qcom/pinctrl-sdx55.c +1 -1
@@ -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)

#4 lore raw
In reply to Arnd Bergmann
Quoted 5 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

clang is clearly correct to point out a typo in a silly array of strings:

Quoted 7 lines

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")

Patch applied.

Yours,
Linus Walleij

#5 lore raw
In reply to Arnd Bergmann
This patch was applied to qcom/linux.git (refs/heads/for-next):

Hello:

This patch was applied to qcom/linux.git (refs/heads/for-next):

Quoted 11 lines · On Tue, 23 Mar 2021 14:17:13 +0100 you wrote:

From: Arnd Bergmann <[email protected]>

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