drivers/pinctrl/intel/pinctrl-baytrail.c: fix build with gcc-4.4

gcc-4.4 and thereabouts has issues with initializers of anonymous
unions, and it generates the following warnings:

  drivers/pinctrl/intel/pinctrl-baytrail.c:413: error: unknown field 'simple_funcs' specified in initializer
  drivers/pinctrl/intel/pinctrl-baytrail.c:413: warning: missing braces around initializer
  drivers/pinctrl/intel/pinctrl-baytrail.c:413: warning: (near initialization for 'byt_score_groups[0].<anonymous>')
  drivers/pinctrl/intel/pinctrl-baytrail.c:415: error: unknown field 'simple_funcs' specified in initializer
  drivers/pinctrl/intel/pinctrl-baytrail.c:417: error: unknown field 'simple_funcs' specified in initializer
  ...

Work around this.

Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Cc: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/pinctrl/intel/pinctrl-baytrail.c b/drivers/pinctrl/intel/pinctrl-baytrail.c
index 55182fc..677a811 100644 (file)
--- a/drivers/pinctrl/intel/pinctrl-baytrail.c
+++ b/drivers/pinctrl/intel/pinctrl-baytrail.c
@@ -153,8 +153,10 @@ struct byt_community {
                .name                   = (n),                  \
                .pins                   = (p),                  \
                .npins                  = ARRAY_SIZE((p)),      \
-               .has_simple_funcs       = 1,            \
-               .simple_funcs           = (f),                  \
+               .has_simple_funcs       = 1,                    \
+               {                                               \
+                       .simple_funcs           = (f),          \
+               },                                              \
                .nfuncs                 = ARRAY_SIZE((f)),      \
        }
 #define PIN_GROUP_MIXED(n, p, f)                               \
@@ -163,7 +165,9 @@ struct byt_community {
                .pins                   = (p),                  \
                .npins                  = ARRAY_SIZE((p)),      \
                .has_simple_funcs       = 0,                    \
-               .mixed_funcs            = (f),                  \
+               {                                               \
+                       .mixed_funcs            = (f),          \
+               },                                              \
                .nfuncs                 = ARRAY_SIZE((f)),      \
        }