Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

pinctrl: sh-pfc: sh7734: Add missing cfg macro parameter to fix build

When building for SH7734:

    drivers/pinctrl/sh-pfc/pfc-sh7734.c:586:1: error: macro "_GP_DATA" passed 5 arguments, but takes just 4
    drivers/pinctrl/sh-pfc/pfc-sh7734.c:586:2: error: '_GP_DATA' undeclared here (not in a function)
    drivers/pinctrl/sh-pfc/pfc-sh7734.c:586:1: error: macro "_GP_DATA" passed 5 arguments, but takes just 4
    drivers/pinctrl/sh-pfc/pfc-sh7734.c:586:1: error: macro "_GP_DATA" passed 5 arguments, but takes just 4
    ...
    drivers/pinctrl/sh-pfc/pfc-sh7734.c:2389:1: error: macro "_GP_INOUTSEL" passed 5 arguments, but takes just 4
    drivers/pinctrl/sh-pfc/pfc-sh7734.c:2389:53: error: '_GP_INOUTSEL' undeclared here (not in a function)
    drivers/pinctrl/sh-pfc/pfc-sh7734.c:2389:2: warning: initialization makes integer from pointer without a cast [enabled by default]
    drivers/pinctrl/sh-pfc/pfc-sh7734.c:2389:2: warning: (near initialization for '(anonymous)[0]') [enabled by default]
    ...
    drivers/pinctrl/sh-pfc/pfc-sh7734.c:2416:1: error: macro "_GP_INDT" passed 5 arguments, but takes just 4
    drivers/pinctrl/sh-pfc/pfc-sh7734.c:2416:47: error: '_GP_INDT' undeclared here (not in a function)
    drivers/pinctrl/sh-pfc/pfc-sh7734.c:2416:2: warning: initialization makes integer from pointer without a cast [enabled by default]
    drivers/pinctrl/sh-pfc/pfc-sh7734.c:2416:2: warning: (near initialization for '(anonymous)[0]') [enabled by default]
    ...

Add the missing "cfg" macro parameters to the sh7734-specific
_GP_DATA(), _GP_INOUTSEL(), and _GP_INDT() macros to fix this.

Fixes: 22768fc60abbf58b ("pinctrl: sh-pfc: Add macros defining GP ports with config flags")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Geert Uytterhoeven 9 years ago
parent
f97c230966
commit
48111b79b7
1 changed files with 3 additions and 3 deletions
Unified View Show Diff Stats
  1. 3 3
      drivers/pinctrl/sh-pfc/pfc-sh7734.c

+ 3 - 3
drivers/pinctrl/sh-pfc/pfc-sh7734.c
View File 

@@ -31,11 +31,11 @@
 
 	PORT_GP_12(5, fn, sfx)
 
 	PORT_GP_12(5, fn, sfx)
 
 
 
 #undef _GP_DATA
 
 #undef _GP_DATA
 
-#define _GP_DATA(bank, pin, name, sfx)					\
 
+#define _GP_DATA(bank, pin, name, sfx, cfg)				\
 
 	PINMUX_DATA(name##_DATA, name##_FN, name##_IN, name##_OUT)
 
 	PINMUX_DATA(name##_DATA, name##_FN, name##_IN, name##_OUT)
 
 
 
-#define _GP_INOUTSEL(bank, pin, name, sfx)	name##_IN, name##_OUT
 
-#define _GP_INDT(bank, pin, name, sfx)		name##_DATA
 
+#define _GP_INOUTSEL(bank, pin, name, sfx, cfg)	name##_IN, name##_OUT
 
+#define _GP_INDT(bank, pin, name, sfx, cfg)	name##_DATA
 
 #define GP_INOUTSEL(bank)	PORT_GP_32_REV(bank, _GP_INOUTSEL, unused)
 
 #define GP_INOUTSEL(bank)	PORT_GP_32_REV(bank, _GP_INOUTSEL, unused)
 
 #define GP_INDT(bank)		PORT_GP_32_REV(bank, _GP_INDT, unused)
 
 #define GP_INDT(bank)		PORT_GP_32_REV(bank, _GP_INDT, unused)