pinctrl: bcm2835: Use define directive for BCM2835_PINCONF_PARAM_PULL
authorNathan Chancellor <natechancellor@gmail.com>
Thu, 1 Nov 2018 00:46:54 +0000 (17:46 -0700)
committerLinus Walleij <linus.walleij@linaro.org>
Fri, 9 Nov 2018 09:22:28 +0000 (10:22 +0100)
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>
drivers/pinctrl/bcm/pinctrl-bcm2835.c

index 08925d24180b08f976137a60b6e0533b4340e636..1bd3c10ce189394ead8d74faa0b543471b79fce3 100644 (file)
 #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),
-};
+/* argument: bcm2835_pinconf_pull */
+#define BCM2835_PINCONF_PARAM_PULL     (PIN_CONFIG_END + 1)
 
 struct bcm2835_pinctrl {
        struct device *dev;