Commit bbccb9c7 authored May 26, 2016 by Andrew Morton Committed by Linus Torvalds May 26, 2016

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>

parent 4abaac9b

drivers/pinctrl/intel/pinctrl-baytrail.c

+7 −3

Original line number	Diff line number	Diff line
		@@ -154,7 +154,9 @@ struct byt_community {
		.pins = (p), \
		.npins = ARRAY_SIZE((p)), \
		.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), \
		}, \
		.nfuncs = ARRAY_SIZE((f)), \
		}