Commit 5efa36e7 authored Oct 31, 2018 by Nathan Chancellor Committed by Greg Kroah-Hartman Dec 01, 2019

pinctrl: bcm2835: Use define directive for BCM2835_PINCONF_PARAM_PULL



[ Upstream commit b40ac08ff886302a6aa457fd72e94a969f50e245 ]

Clang warns when one enumerated type is implicitly converted to another:

drivers/pinctrl/bcm/pinctrl-bcm2835.c:707:40: warning: implicit
conversion from enumeration type 'enum bcm2835_pinconf_param' to
different enumeration type 'enum pin_config_param' [-Wenum-conversion]
        configs[0] = pinconf_to_config_packed(BCM2835_PINCONF_PARAM_PULL, pull);
                     ~~~~~~~~~~~~~~~~~~~~~~~~ ^~~~~~~~~~~~~~~~~~~~~~~~~~
1 warning generated.

It is expected that pinctrl drivers can extend pin_config_param because
of the gap between PIN_CONFIG_END and PIN_CONFIG_MAX so this conversion
isn't an issue. Most drivers that take advantage of this define the
PIN_CONFIG variables as constants, rather than enumerated values. Do the
same thing here so that Clang no longer warns.

Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
Acked-by: Stefan Wahren <stefan.wahren@i2se.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent bad4da12

drivers/pinctrl/bcm/pinctrl-bcm2835.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -72,10 +72,8 @@
		#define GPIO_REG_OFFSET(p) ((p) / 32)
		#define GPIO_REG_SHIFT(p) ((p) % 32)

		enum bcm2835_pinconf_param {
		/* argument: bcm2835_pinconf_pull */
		BCM2835_PINCONF_PARAM_PULL = (PIN_CONFIG_END + 1),
		};
		#define BCM2835_PINCONF_PARAM_PULL (PIN_CONFIG_END + 1)

		struct bcm2835_pinctrl {
		struct device *dev;