Skip to contentSkip to conversation

ARM: pxa: cm-x2xx: avoid duplicate macro warnings

PATCH In review Arnd Bergmann 2 participants 2 messages Dec 9, 2015

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

PATCH 1/1 ARM: pxa: cm-x2xx: avoid duplicate macro warnings

In an old commit, we worked around the duplicate definition of GPIO24_SSP1_SFRM in cm-x2xx.c, which includes files for both pxa25x and pxa27x. Apparently the problem has come back and we now have four additional duplicate symbols that cause warnings:

In file included from /git/arm-soc/arch/arm/mach-pxa/pxa27x.h:7:0,

                 from /git/arm-soc/arch/arm/mach-pxa/cm-x2xx.c:27:

/git/arm-soc/arch/arm/mach-pxa/mfp-pxa27x.h:21:0: warning: "GPIO86_GPIO" redefined
#define GPIO86_GPIO MFP_CFG_IN(GPIO86, AF0)

This uses the same hack as before and undefines all symbols that are defined more than once. Fortunately, cm-x2xx does not need any of these.

arch/arm/mach-pxa/cm-x2xx.c +9 -0
index f2d801160079..7202022ee243 100644
@@ -24,7 +24,16 @@
 
 #include "pxa25x.h"
 #undef GPIO24_SSP1_SFRM
+#undef GPIO86_GPIO
+#undef GPIO87_GPIO
+#undef GPIO88_GPIO
+#undef GPIO89_GPIO
 #include "pxa27x.h"
+#undef GPIO24_SSP1_SFRM
+#undef GPIO86_GPIO
+#undef GPIO87_GPIO
+#undef GPIO88_GPIO
+#undef GPIO89_GPIO
 #include <mach/audio.h>
 #include <linux/platform_data/video-pxafb.h>
 #include <mach/smemc.h>
maintainer Acked-by on v1 1/1
#1 lore raw
Quoted 7 lines · Arnd Bergmann

In an old commit, we worked around the duplicate definition of GPIO24_SSP1_SFRM in cm-x2xx.c, which includes files for both pxa25x and pxa27x. Apparently the problem has come back and we now have four additional duplicate symbols that cause warnings:

In file included from /git/arm-soc/arch/arm/mach-pxa/pxa27x.h:7:0,

                 from /git/arm-soc/arch/arm/mach-pxa/cm-x2xx.c:27:
Quoted 8 lines

/git/arm-soc/arch/arm/mach-pxa/mfp-pxa27x.h:21:0: warning: "GPIO86_GPIO" redefined
#define GPIO86_GPIO MFP_CFG_IN(GPIO86, AF0)

This uses the same hack as before and undefines all symbols that are defined more than once. Fortunately, cm-x2xx does not need any of these.

Digging out old patches of 2012, cool.

I suppose it's a necessary hack until I manage to kill the mfp interface in favor of pinctrl.

Cheers.

--
Robert