From: Greg Kroah-Hartman Date: Mon, 25 Feb 2019 19:50:37 +0000 (+0100) Subject: 4.20-stable patches X-Git-Tag: v4.9.161~8 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d81aa649e0e627af59e252f9502542f75bfcdce6;p=thirdparty%2Fkernel%2Fstable-queue.git 4.20-stable patches added patches: pinctrl-max77620-use-define-directive-for-max77620_pinconf_param-values.patch --- diff --git a/queue-4.20/pinctrl-max77620-use-define-directive-for-max77620_pinconf_param-values.patch b/queue-4.20/pinctrl-max77620-use-define-directive-for-max77620_pinconf_param-values.patch new file mode 100644 index 00000000000..8727393e3de --- /dev/null +++ b/queue-4.20/pinctrl-max77620-use-define-directive-for-max77620_pinconf_param-values.patch @@ -0,0 +1,55 @@ +From 1f60652dd586d1b3eee7c4602892a97a62fa937a Mon Sep 17 00:00:00 2001 +From: Nathan Chancellor +Date: Wed, 31 Oct 2018 17:50:21 -0700 +Subject: pinctrl: max77620: Use define directive for max77620_pinconf_param values + +From: Nathan Chancellor + +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 +Signed-off-by: Linus Walleij +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/pinctrl/pinctrl-max77620.c | 14 ++++++-------- + 1 file changed, 6 insertions(+), 8 deletions(-) + +--- a/drivers/pinctrl/pinctrl-max77620.c ++++ b/drivers/pinctrl/pinctrl-max77620.c +@@ -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; diff --git a/queue-4.20/series b/queue-4.20/series index e662b732ae0..cc24dfcd3ca 100644 --- a/queue-4.20/series +++ b/queue-4.20/series @@ -180,3 +180,4 @@ netfilter-nft_compat-use-after-free-when-deleting-targets.patch netfilter-ipv6-don-t-preserve-original-oif-for-loopback-address.patch netfilter-nfnetlink_osf-add-missing-fmatch-check.patch netfilter-ipt_clusterip-fix-sleep-in-atomic-bug-in-clusterip_config_entry_put.patch +pinctrl-max77620-use-define-directive-for-max77620_pinconf_param-values.patch