[BACKPORT 4.19.y 0/3] Candidates from Spreadtrum 4.14 product kernel

[BACKPORT 4.19.y 0/3] Candidates from Spreadtrum 4.14 product kernel

[Baolin Wang]

With Arnd's script [1] help, I found some bugfixes in Spreadtrum 4.14 product
kernel, but missing in v4.19.75:

513e1073d52e locking/lockdep: Add debug_locks check in __lock_downgrade()
957063c92473 pinctrl: sprd: Use define directive for sprd_pinconf_params values
87a2b65fc855 power: supply: sysfs: ratelimit property read error message

[1] https://lore.kernel.org/lkml/20190322154425.3852517-19-arnd@arndb.de/T/

David Lechner (1):
  power: supply: sysfs: ratelimit property read error message

Nathan Chancellor (1):
  pinctrl: sprd: Use define directive for sprd_pinconf_params values

Waiman Long (1):
  locking/lockdep: Add debug_locks check in __lock_downgrade()

 drivers/pinctrl/sprd/pinctrl-sprd.c       |    6 ++----
 drivers/power/supply/power_supply_sysfs.c |    3 ++-
 kernel/locking/lockdep.c                  |    3 +++
 3 files changed, 7 insertions(+), 5 deletions(-)

-- 
1.7.9.5

[BACKPORT 4.19.y 2/3] pinctrl: sprd: Use define directive for sprd_pinconf_params values

[Baolin Wang]

From: Nathan Chancellor <natechancellor@gmail.com>

[Upstream commit 957063c924736d4341e5d588757b9f31e8f6fa24]

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

drivers/pinctrl/sprd/pinctrl-sprd.c:845:19: warning: implicit conversion
from enumeration type 'enum sprd_pinconf_params' to different
enumeration type 'enum pin_config_param' [-Wenum-conversion]
        {"sprd,control", SPRD_PIN_CONFIG_CONTROL, 0},
        ~                ^~~~~~~~~~~~~~~~~~~~~~~
drivers/pinctrl/sprd/pinctrl-sprd.c:846:22: warning: implicit conversion
from enumeration type 'enum sprd_pinconf_params' to different
enumeration type 'enum pin_config_param' [-Wenum-conversion]
        {"sprd,sleep-mode", SPRD_PIN_CONFIG_SLEEP_MODE, 0},
        ~                   ^~~~~~~~~~~~~~~~~~~~~~~~~~

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/138
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
Reviewed-by: Baolin Wang <baolin.wang@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
---
 drivers/pinctrl/sprd/pinctrl-sprd.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/pinctrl/sprd/pinctrl-sprd.c b/drivers/pinctrl/sprd/pinctrl-sprd.c
index 78c2f54..8f3468d 100644
--- a/drivers/pinctrl/sprd/pinctrl-sprd.c
+++ b/drivers/pinctrl/sprd/pinctrl-sprd.c
@@ -159,10 +159,8 @@ struct sprd_pinctrl {
 	struct sprd_pinctrl_soc_info *info;
 };
 
-enum sprd_pinconf_params {
-	SPRD_PIN_CONFIG_CONTROL = PIN_CONFIG_END + 1,
-	SPRD_PIN_CONFIG_SLEEP_MODE = PIN_CONFIG_END + 2,
-};
+#define SPRD_PIN_CONFIG_CONTROL		(PIN_CONFIG_END + 1)
+#define SPRD_PIN_CONFIG_SLEEP_MODE	(PIN_CONFIG_END + 2)
 
 static int sprd_pinctrl_get_id_by_name(struct sprd_pinctrl *sprd_pctl,
 				       const char *name)
-- 
1.7.9.5

Re: [BACKPORT 4.19.y 0/3] Candidates from Spreadtrum 4.14 product kernel

[Sasha Levin]

On Wed, Sep 25, 2019 at 05:52:26PM +0800, Baolin Wang wrote:
>With Arnd's script [1] help, I found some bugfixes in Spreadtrum 4.14 product
>kernel, but missing in v4.19.75:
>
>513e1073d52e locking/lockdep: Add debug_locks check in __lock_downgrade()
>957063c92473 pinctrl: sprd: Use define directive for sprd_pinconf_params values
>87a2b65fc855 power: supply: sysfs: ratelimit property read error message
>
>[1] https://lore.kernel.org/lkml/20190322154425.3852517-19-arnd@arndb.de/T/
>
>David Lechner (1):
>  power: supply: sysfs: ratelimit property read error message
>
>Nathan Chancellor (1):
>  pinctrl: sprd: Use define directive for sprd_pinconf_params values
>
>Waiman Long (1):
>  locking/lockdep: Add debug_locks check in __lock_downgrade()
>
> drivers/pinctrl/sprd/pinctrl-sprd.c       |    6 ++----
> drivers/power/supply/power_supply_sysfs.c |    3 ++-
> kernel/locking/lockdep.c                  |    3 +++
> 3 files changed, 7 insertions(+), 5 deletions(-)

I've queued these up for 4.19, 4.14 and some for 4.9 and 4.4. Thank you.

--
Thanks,
Sasha