drop hwmon patch from 4.9 and 4.4

diff --git a/queue-4.4/hwmon-pwm-fan-disable-pwm-if-fetching-cooling-data-fails.patch b/queue-4.4/hwmon-pwm-fan-disable-pwm-if-fetching-cooling-data-fails.patch
deleted file mode 100644 (file)
index 24dc282..0000000
--- a/queue-4.4/hwmon-pwm-fan-disable-pwm-if-fetching-cooling-data-fails.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 53f1647da3e8fb3e89066798f0fdc045064d353d Mon Sep 17 00:00:00 2001
-From: Stefan Wahren <stefan.wahren@i2se.com>
-Date: Wed, 3 Apr 2019 14:48:33 +0200
-Subject: hwmon: (pwm-fan) Disable PWM if fetching cooling data fails
-
-From: Stefan Wahren <stefan.wahren@i2se.com>
-
-commit 53f1647da3e8fb3e89066798f0fdc045064d353d upstream.
-
-In case pwm_fan_of_get_cooling_data() fails we should disable the PWM
-just like in the other error cases.
-
-Fixes: 2e5219c77183 ("hwmon: (pwm-fan) Read PWM FAN configuration from device tree")
-Cc: <stable@vger.kernel.org> # 4.14+
-Reported-by: Guenter Rock <linux@roeck-us.net>
-Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
-Signed-off-by: Guenter Roeck <linux@roeck-us.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/hwmon/pwm-fan.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/hwmon/pwm-fan.c
-+++ b/drivers/hwmon/pwm-fan.c
-@@ -260,7 +260,7 @@ static int pwm_fan_probe(struct platform
- 
-       ret = pwm_fan_of_get_cooling_data(&pdev->dev, ctx);
-       if (ret)
--              return ret;
-+              goto err_pwm_disable;
- 
-       ctx->pwm_fan_state = ctx->pwm_fan_max_state;
-       if (IS_ENABLED(CONFIG_THERMAL)) {

diff --git a/queue-4.4/series b/queue-4.4/series
index da3aff799905ae375a25d45e969be421509f92c5..56765c9535ebf8c6405d33f862c646a0c77206ae 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -159,4 +159,3 @@ timer-debug-change-proc-timer_stats-from-0644-to-0600.patch
 netfilter-compat-initialize-all-fields-in-xt_init.patch
 mm-vmstat-make-quiet_vmstat-lighter.patch
 platform-x86-sony-laptop-fix-unintentional-fall-through.patch
-hwmon-pwm-fan-disable-pwm-if-fetching-cooling-data-fails.patch

diff --git a/queue-4.9/hwmon-pwm-fan-disable-pwm-if-fetching-cooling-data-fails.patch b/queue-4.9/hwmon-pwm-fan-disable-pwm-if-fetching-cooling-data-fails.patch
deleted file mode 100644 (file)
index 662f5e0..0000000
--- a/queue-4.9/hwmon-pwm-fan-disable-pwm-if-fetching-cooling-data-fails.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 53f1647da3e8fb3e89066798f0fdc045064d353d Mon Sep 17 00:00:00 2001
-From: Stefan Wahren <stefan.wahren@i2se.com>
-Date: Wed, 3 Apr 2019 14:48:33 +0200
-Subject: hwmon: (pwm-fan) Disable PWM if fetching cooling data fails
-
-From: Stefan Wahren <stefan.wahren@i2se.com>
-
-commit 53f1647da3e8fb3e89066798f0fdc045064d353d upstream.
-
-In case pwm_fan_of_get_cooling_data() fails we should disable the PWM
-just like in the other error cases.
-
-Fixes: 2e5219c77183 ("hwmon: (pwm-fan) Read PWM FAN configuration from device tree")
-Cc: <stable@vger.kernel.org> # 4.14+
-Reported-by: Guenter Rock <linux@roeck-us.net>
-Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
-Signed-off-by: Guenter Roeck <linux@roeck-us.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/hwmon/pwm-fan.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/hwmon/pwm-fan.c
-+++ b/drivers/hwmon/pwm-fan.c
-@@ -272,7 +272,7 @@ static int pwm_fan_probe(struct platform
- 
-       ret = pwm_fan_of_get_cooling_data(&pdev->dev, ctx);
-       if (ret)
--              return ret;
-+              goto err_pwm_disable;
- 
-       ctx->pwm_fan_state = ctx->pwm_fan_max_state;
-       if (IS_ENABLED(CONFIG_THERMAL)) {

diff --git a/queue-4.9/series b/queue-4.9/series
index d233f8fd82745fbe9d5bb7787d0a788659704806..d50e07ac4b15ae464f444d7e84249bf469cbfb3b 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -2,4 +2,3 @@ netfilter-compat-initialize-all-fields-in-xt_init.patch
 bpf-fix-struct-htab_elem-layout.patch
 bpf-convert-htab-map-to-hlist_nulls.patch
 platform-x86-sony-laptop-fix-unintentional-fall-through.patch
-hwmon-pwm-fan-disable-pwm-if-fetching-cooling-data-fails.patch