]> git.itanic.dy.fi Git - linux-stable/commitdiff
pinctrl: max77620: Use define directive for max77620_pinconf_param values
authorNathan Chancellor <natechancellor@gmail.com>
Thu, 1 Nov 2018 00:50:21 +0000 (17:50 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 27 Feb 2019 09:09:03 +0000 (10:09 +0100)
commit 1f60652dd586d1b3eee7c4602892a97a62fa937a upstream.

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

drivers/pinctrl/pinctrl-max77620.c:56:12: warning: implicit conversion
from enumeration type 'enum max77620_pinconf_param' to different
enumeration type 'enum pin_config_param' [-Wenum-conversion]
                .param = MAX77620_ACTIVE_FPS_SOURCE,
                         ^~~~~~~~~~~~~~~~~~~~~~~~~~

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.

Link: https://github.com/ClangBuiltLinux/linux/issues/139
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/pinctrl/pinctrl-max77620.c

index a7f37063518ec3217633e2fffdac2f38d2ddce57..3d05bc1937d40bd081ceee657a1c7243f3de7a4f 100644 (file)
@@ -34,14 +34,12 @@ enum max77620_pin_ppdrv {
        MAX77620_PIN_PP_DRV,
 };
 
-enum max77620_pinconf_param {
-       MAX77620_ACTIVE_FPS_SOURCE = PIN_CONFIG_END + 1,
-       MAX77620_ACTIVE_FPS_POWER_ON_SLOTS,
-       MAX77620_ACTIVE_FPS_POWER_DOWN_SLOTS,
-       MAX77620_SUSPEND_FPS_SOURCE,
-       MAX77620_SUSPEND_FPS_POWER_ON_SLOTS,
-       MAX77620_SUSPEND_FPS_POWER_DOWN_SLOTS,
-};
+#define MAX77620_ACTIVE_FPS_SOURCE             (PIN_CONFIG_END + 1)
+#define MAX77620_ACTIVE_FPS_POWER_ON_SLOTS     (PIN_CONFIG_END + 2)
+#define MAX77620_ACTIVE_FPS_POWER_DOWN_SLOTS   (PIN_CONFIG_END + 3)
+#define MAX77620_SUSPEND_FPS_SOURCE            (PIN_CONFIG_END + 4)
+#define MAX77620_SUSPEND_FPS_POWER_ON_SLOTS    (PIN_CONFIG_END + 5)
+#define MAX77620_SUSPEND_FPS_POWER_DOWN_SLOTS  (PIN_CONFIG_END + 6)
 
 struct max77620_pin_function {
        const char *name;