Commit e889b298 authored Nov 08, 2018 by Jacopo Mondi Committed by Geert Uytterhoeven Nov 13, 2018

pinctrl: sh-pfc: Add optional arg to VIN_DATA_PIN_GROUP



VIN data groups may appear on different sets of pins, usually named
"vinX_data_[a|b]". The existing VIN_DATA_PIN_GROUP() does not support
appending the '_a' or '_b' suffix, leading to the definition of group
names not consistent with the ones defined using the SH_PFC_PIN_GROUP()
macro.

Fix this by making the VIN_DATA_PIN_GROUP macro a variadic one,
which accepts an optional 'version' argument.

Fixes: 423caa52 ("pinctrl: sh-pfc: r8a779[01]: Move 'union vin_data' to shared header file")
Signed-off-by: Jacopo Mondi <jacopo+renesas@jmondi.org>
Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

parent 3ad8fbd8

drivers/pinctrl/sh-pfc/sh_pfc.h

+8 −7

Original line number	Diff line number	Diff line
		@@ -55,14 +55,15 @@ struct sh_pfc_pin_group {
		/*
		* Using union vin_data{,12,16} saves memory occupied by the VIN data pins.
		* VIN_DATA_PIN_GROUP() is a macro used to describe the VIN pin groups
		* in this case.
		* in this case. It accepts an optional 'version' argument used when the
		* same group can appear on a different set of pins.
		*/
		#define VIN_DATA_PIN_GROUP(n, s) \
		#define VIN_DATA_PIN_GROUP(n, s, ...) \
		{ \
		.name = #n#s, \
		.pins = n##_pins.data##s, \
		.mux = n##_mux.data##s, \
		.nr_pins = ARRAY_SIZE(n##_pins.data##s), \
		.name = #n#s#__VA_ARGS__, \
		.pins = n##__VA_ARGS__##_pins.data##s, \
		.mux = n##__VA_ARGS__##_mux.data##s, \
		.nr_pins = ARRAY_SIZE(n##__VA_ARGS__##_pins.data##s), \
		}

		union vin_data12 {

Admin message