pinctrl: exynos5440/samsung: Staticize pcfgs

PATCH Applied Axel Lin 4 participants 5 messages Nov 27, 2012 – Dec 10, 2012

Subsystems (2)

Arm Samsung Exynos Pin control

lore

Share & tools

lore

Axel Lin

author

2012-11-27 14:50 UTC #0 lore raw

PATCH 1/1 pinctrl: exynos5440/samsung: Staticize pcfgs

I got below build error with random config if CONFIG_PINCTRL_SAMSUNG=y && CONFIG_PINCTRL_EXYNOS5440=y.

Fix the build error by making pcfgs static.

LD drivers/pinctrl/built-in.o
drivers/pinctrl/pinctrl-exynos5440.o: In function `.LANCHOR0':
pinctrl-exynos5440.c:(.data+0x54): multiple definition of `pcfgs' drivers/pinctrl/pinctrl-samsung.o:pinctrl-samsung.c:(.data+0x54): first defined here make[2]: *** [drivers/pinctrl/built-in.o] Error 1
make[1]: *** [drivers/pinctrl] Error 2
make: *** [drivers] Error 2

Signed-off-by Axel Lin <[email protected]>

---
 drivers/pinctrl/pinctrl-exynos5440.c |    2 +-
 drivers/pinctrl/pinctrl-samsung.c    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

drivers/pinctrl/pinctrl-exynos5440.c +1 -1

index b8635f6..07db895 100644
@@ -117,7 +117,7 @@ struct exynos5440_pinctrl_priv_data {
 };
 
 /* list of all possible config options supported */
-struct pin_config {
+static struct pin_config {
 	char		*prop_cfg;
 	unsigned int	cfg_type;
 } pcfgs[] = {

drivers/pinctrl/pinctrl-samsung.c +1 -1

index 8f31b65..864fed8 100644
@@ -37,7 +37,7 @@
 #define FSUFFIX_LEN		sizeof(FUNCTION_SUFFIX)
 
 /* list of all possible config options supported */
-struct pin_config {
+static struct pin_config {
 	char		*prop_cfg;
 	unsigned int	cfg_type;
 } pcfgs[] = {

Signature · 1 line

1.7.9.5

Linus Walleij

Acked-by on v1 1/1

2012-12-01 23:06 UTC #1 lore raw

Quoted 13 lines · Axel Lin

I got below build error with random config if CONFIG_PINCTRL_SAMSUNG=y && CONFIG_PINCTRL_EXYNOS5440=y.
Fix the build error by making pcfgs static.
LD drivers/pinctrl/built-in.o
drivers/pinctrl/pinctrl-exynos5440.o: In function `.LANCHOR0':
pinctrl-exynos5440.c:(.data+0x54): multiple definition of `pcfgs' drivers/pinctrl/pinctrl-samsung.o:pinctrl-samsung.c:(.data+0x54): first defined here make[2]: *** [drivers/pinctrl/built-in.o] Error 1
make[1]: *** [drivers/pinctrl] Error 2
make: *** [drivers] Error 2

Quoted 1 line

Signed-off-by Axel Lin <[email protected]>

I'm not handling the Samsung drivers for this merge window. Samsung guys, can you please pick up this patch?

Acked-by Linus Walleij <[email protected]>

Yours,
Linus Walleij

Kukjin Kim

Applied

2012-12-10 01:40 UTC #2 lore raw

Quoted 18 lines · Linus Walleij

Quoted 1 line · Axel Lin
I got below build error with random config if CONFIG_PINCTRL_SAMSUNG=y
&&
Quoted 8 lines
CONFIG_PINCTRL_EXYNOS5440=y.
Fix the build error by making pcfgs static.
LD drivers/pinctrl/built-in.o
drivers/pinctrl/pinctrl-exynos5440.o: In function `.LANCHOR0':
pinctrl-exynos5440.c:(.data+0x54): multiple definition of `pcfgs' drivers/pinctrl/pinctrl-samsung.o:pinctrl-samsung.c:(.data+0x54): first
defined here
Quoted 4 lines
make[2]: *** [drivers/pinctrl/built-in.o] Error 1
make[1]: *** [drivers/pinctrl] Error 2
make: *** [drivers] Error 2

Quoted 7 lines

Quoted 1 line
Signed-off-by Axel Lin <[email protected]>
I'm not handling the Samsung drivers for this merge window. Samsung guys, can you please pick up this patch?
Acked-by Linus Walleij <[email protected]>

Applied, thanks.

Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.

Thomas Abraham

Acked-by on v1 1/1

2012-12-03 09:07 UTC #3 lore raw

In reply to Axel Lin

Quoted 13 lines · Axel Lin

I got below build error with random config if CONFIG_PINCTRL_SAMSUNG=y && CONFIG_PINCTRL_EXYNOS5440=y.
Fix the build error by making pcfgs static.
LD drivers/pinctrl/built-in.o
drivers/pinctrl/pinctrl-exynos5440.o: In function `.LANCHOR0':
pinctrl-exynos5440.c:(.data+0x54): multiple definition of `pcfgs' drivers/pinctrl/pinctrl-samsung.o:pinctrl-samsung.c:(.data+0x54): first defined here make[2]: *** [drivers/pinctrl/built-in.o] Error 1
make[1]: *** [drivers/pinctrl] Error 2
make: *** [drivers] Error 2

Quoted 1 line

Signed-off-by Axel Lin <[email protected]>

Acked-by Thomas Abraham <[email protected]>

Dear Mr. Kim,

Could you please consider this patch in your next pull request for fixes.

Thanks,
Thomas.

[...]

Kukjin Kim

2012-12-03 09:30 UTC #4 lore raw

Quoted 17 lines · Thomas Abraham

Quoted 1 line · Axel Lin
I got below build error with random config if CONFIG_PINCTRL_SAMSUNG=y
&&
Quoted 8 lines
CONFIG_PINCTRL_EXYNOS5440=y.
Fix the build error by making pcfgs static.
LD drivers/pinctrl/built-in.o
drivers/pinctrl/pinctrl-exynos5440.o: In function `.LANCHOR0':
pinctrl-exynos5440.c:(.data+0x54): multiple definition of `pcfgs' drivers/pinctrl/pinctrl-samsung.o:pinctrl-samsung.c:(.data+0x54): first
defined here
Quoted 4 lines
make[2]: *** [drivers/pinctrl/built-in.o] Error 1
make[1]: *** [drivers/pinctrl] Error 2
make: *** [drivers] Error 2

Quoted 8 lines

Quoted 1 line
Signed-off-by Axel Lin <[email protected]>
Acked-by Thomas Abraham <[email protected]>
Dear Mr. Kim,
Could you please consider this patch in your next pull request for fixes.

Sure, I will.

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.