Commit 5efa36e7 authored by Nathan Chancellor's avatar Nathan Chancellor Committed by Greg Kroah-Hartman

pinctrl: bcm2835: Use define directive for BCM2835_PINCONF_PARAM_PULL

[ Upstream commit b40ac08f ]

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: default avatarNathan Chancellor <natechancellor@gmail.com>
Acked-by: default avatarStefan Wahren <stefan.wahren@i2se.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent bad4da12
...@@ -72,10 +72,8 @@ ...@@ -72,10 +72,8 @@
#define GPIO_REG_OFFSET(p) ((p) / 32) #define GPIO_REG_OFFSET(p) ((p) / 32)
#define GPIO_REG_SHIFT(p) ((p) % 32) #define GPIO_REG_SHIFT(p) ((p) % 32)
enum bcm2835_pinconf_param { /* argument: bcm2835_pinconf_pull */
/* argument: bcm2835_pinconf_pull */ #define BCM2835_PINCONF_PARAM_PULL (PIN_CONFIG_END + 1)
BCM2835_PINCONF_PARAM_PULL = (PIN_CONFIG_END + 1),
};
struct bcm2835_pinctrl { struct bcm2835_pinctrl {
struct device *dev; struct device *dev;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment