drop gpiolib-respect-error-code-of-get_direction.patch

diff --git a/queue-4.14/gpiolib-respect-error-code-of-get_direction.patch b/queue-4.14/gpiolib-respect-error-code-of-get_direction.patch
deleted file mode 100644 (file)
index a39d371..0000000
--- a/queue-4.14/gpiolib-respect-error-code-of-get_direction.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From foo@baz Mon Sep 24 09:35:12 CEST 2018
-From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
-Date: Tue, 3 Jul 2018 03:38:31 +0300
-Subject: gpiolib: Respect error code of ->get_direction()
-
-From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
-
-[ Upstream commit 36b312792b97933dc07abe074f50941199bd357c ]
-
-In case we try to lock GPIO pin as IRQ when something going wrong
-we print a misleading message.
-
-Correct this by checking an error code from ->get_direction() in
-gpiochip_lock_as_irq() and printing a corresponding message.
-
-Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
-Cc: Mika Westerberg <mika.westerberg@linux.intel.com>
-Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/gpio/gpiolib.c |    6 ++++++
- 1 file changed, 6 insertions(+)
-
---- a/drivers/gpio/gpiolib.c
-+++ b/drivers/gpio/gpiolib.c
-@@ -2811,6 +2811,12 @@ int gpiochip_lock_as_irq(struct gpio_chi
-       if (!chip->can_sleep && chip->get_direction) {
-               int dir = chip->get_direction(chip, offset);
- 
-+              if (dir < 0) {
-+                      chip_err(chip, "%s: cannot get GPIO direction\n",
-+                               __func__);
-+                      return dir;
-+              }
-+
-               if (dir)
-                       clear_bit(FLAG_IS_OUT, &desc->flags);
-               else

diff --git a/queue-4.14/series b/queue-4.14/series
index 78e5708a7f348be8554d78800bc62a257e1170b3..2913a4689c381f141dbd1f7f6984004df9cfb97c 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -150,7 +150,6 @@ selftest-timers-tweak-raw_skew-to-skip-when-adj_offset-other-clock-adjustments-a
 drm-panel-type-promotion-bug-in-s6e8aa0_read_mtp_id.patch
 blk-mq-only-attempt-to-merge-bio-if-there-is-rq-in-sw-queue.patch
 blk-mq-avoid-to-synchronize-rcu-inside-blk_cleanup_queue.patch
-gpiolib-respect-error-code-of-get_direction.patch
 pinctrl-msm-fix-msm_config_group_get-to-be-compliant.patch
 pinctrl-qcom-spmi-gpio-fix-pmic_gpio_config_get-to-be-compliant.patch
 clk-tegra-bpmp-don-t-crash-when-a-clock-fails-to-register.patch

diff --git a/queue-4.18/gpiolib-respect-error-code-of-get_direction.patch b/queue-4.18/gpiolib-respect-error-code-of-get_direction.patch
deleted file mode 100644 (file)
index b477cde..0000000
--- a/queue-4.18/gpiolib-respect-error-code-of-get_direction.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From foo@baz Mon Sep 24 09:45:39 CEST 2018
-From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
-Date: Tue, 3 Jul 2018 03:38:31 +0300
-Subject: gpiolib: Respect error code of ->get_direction()
-
-From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
-
-[ Upstream commit 36b312792b97933dc07abe074f50941199bd357c ]
-
-In case we try to lock GPIO pin as IRQ when something going wrong
-we print a misleading message.
-
-Correct this by checking an error code from ->get_direction() in
-gpiochip_lock_as_irq() and printing a corresponding message.
-
-Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
-Cc: Mika Westerberg <mika.westerberg@linux.intel.com>
-Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/gpio/gpiolib.c |    6 ++++++
- 1 file changed, 6 insertions(+)
-
---- a/drivers/gpio/gpiolib.c
-+++ b/drivers/gpio/gpiolib.c
-@@ -3251,6 +3251,12 @@ int gpiochip_lock_as_irq(struct gpio_chi
-       if (!chip->can_sleep && chip->get_direction) {
-               int dir = chip->get_direction(chip, offset);
- 
-+              if (dir < 0) {
-+                      chip_err(chip, "%s: cannot get GPIO direction\n",
-+                               __func__);
-+                      return dir;
-+              }
-+
-               if (dir)
-                       clear_bit(FLAG_IS_OUT, &desc->flags);
-               else

diff --git a/queue-4.18/series b/queue-4.18/series
index ac1112007ab11a25f2a91738e38871d3378f23e6..32635e20f20c20dd4b93c3783b8bdedda94b4608 100644 (file)
--- a/queue-4.18/series
+++ b/queue-4.18/series
@@ -223,7 +223,6 @@ block-dac960.c-fix-defined-but-not-used-build-warnings.patch
 ib-mlx5-fix-uaccess-beyond-count-in-debugfs-read-write-handlers.patch
 blk-mq-only-attempt-to-merge-bio-if-there-is-rq-in-sw-queue.patch
 blk-mq-avoid-to-synchronize-rcu-inside-blk_cleanup_queue.patch
-gpiolib-respect-error-code-of-get_direction.patch
 pinctrl-msm-fix-msm_config_group_get-to-be-compliant.patch
 pinctrl-qcom-spmi-gpio-fix-pmic_gpio_config_get-to-be-compliant.patch
 clk-tegra-bpmp-don-t-crash-when-a-clock-fails-to-register.patch

diff --git a/queue-4.9/gpiolib-respect-error-code-of-get_direction.patch b/queue-4.9/gpiolib-respect-error-code-of-get_direction.patch
deleted file mode 100644 (file)
index a30ba62..0000000
--- a/queue-4.9/gpiolib-respect-error-code-of-get_direction.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From foo@baz Mon Sep 24 09:32:39 CEST 2018
-From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
-Date: Tue, 3 Jul 2018 03:38:31 +0300
-Subject: gpiolib: Respect error code of ->get_direction()
-
-From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
-
-[ Upstream commit 36b312792b97933dc07abe074f50941199bd357c ]
-
-In case we try to lock GPIO pin as IRQ when something going wrong
-we print a misleading message.
-
-Correct this by checking an error code from ->get_direction() in
-gpiochip_lock_as_irq() and printing a corresponding message.
-
-Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
-Cc: Mika Westerberg <mika.westerberg@linux.intel.com>
-Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/gpio/gpiolib.c |    6 ++++++
- 1 file changed, 6 insertions(+)
-
---- a/drivers/gpio/gpiolib.c
-+++ b/drivers/gpio/gpiolib.c
-@@ -2749,6 +2749,12 @@ int gpiochip_lock_as_irq(struct gpio_chi
-       if (!chip->can_sleep && chip->get_direction) {
-               int dir = chip->get_direction(chip, offset);
- 
-+              if (dir < 0) {
-+                      chip_err(chip, "%s: cannot get GPIO direction\n",
-+                               __func__);
-+                      return dir;
-+              }
-+
-               if (dir)
-                       clear_bit(FLAG_IS_OUT, &desc->flags);
-               else

diff --git a/queue-4.9/series b/queue-4.9/series
index bc3ea16abba2d8d0f0c70ac4e4c31e08a5a0fed5..7c3644362158022b012e124aa046e2956799f7e4 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -96,7 +96,6 @@ rtc-bq4802-add-error-handling-for-devm_ioremap.patch
 alsa-pcm-fix-snd_interval_refine-first-last-with-open-min-max.patch
 selftest-timers-tweak-raw_skew-to-skip-when-adj_offset-other-clock-adjustments-are-in-progress.patch
 drm-panel-type-promotion-bug-in-s6e8aa0_read_mtp_id.patch
-gpiolib-respect-error-code-of-get_direction.patch
 pinctrl-qcom-spmi-gpio-fix-pmic_gpio_config_get-to-be-compliant.patch
 mei-bus-type-promotion-bug-in-mei_nfc_if_version.patch
 mips-vdso-match-data-page-cache-colouring-when-d-aliases.patch