drop serial-sprd-use-readable-macros-instead-of-magic-num.patch from everywhere

diff --git a/queue-4.14/serial-sprd-use-readable-macros-instead-of-magic-num.patch b/queue-4.14/serial-sprd-use-readable-macros-instead-of-magic-num.patch
deleted file mode 100644 (file)
index 5ff3793..0000000
--- a/queue-4.14/serial-sprd-use-readable-macros-instead-of-magic-num.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 8013e07364332f6e544de3c465cb10dfaf6d57b4 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 4 Dec 2019 20:00:07 +0800
-Subject: serial: sprd: Use readable macros instead of magic number
-
-From: Yonghan Ye <yonghan.ye@unisoc.com>
-
-[ Upstream commit 2b5a997386b0594e671a32c7e429cf59ac8fc54c ]
-
-Define readable macros instead of magic number to make code more readable.
-
-Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
-Acked-by: Chunyan Zhang <chunyan.zhang@spreadtrum.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/tty/serial/sprd_serial.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/drivers/tty/serial/sprd_serial.c b/drivers/tty/serial/sprd_serial.c
-index 943619ebee38..d8afe55956e7 100644
---- a/drivers/tty/serial/sprd_serial.c
-+++ b/drivers/tty/serial/sprd_serial.c
-@@ -302,6 +302,9 @@ static irqreturn_t sprd_handle_irq(int irq, void *dev_id)
-       if (ims & SPRD_IMSR_TIMEOUT)
-               serial_out(port, SPRD_ICLR, SPRD_ICLR_TIMEOUT);
- 
-+      if (ims & SPRD_IMSR_BREAK_DETECT)
-+              serial_out(port, SPRD_ICLR, SPRD_IMSR_BREAK_DETECT);
-+
-       if (ims & (SPRD_IMSR_RX_FIFO_FULL |
-               SPRD_IMSR_BREAK_DETECT | SPRD_IMSR_TIMEOUT))
-               sprd_rx(port);
--- 
-2.20.1
-

diff --git a/queue-4.14/series b/queue-4.14/series
index 63c0efc1993fc0dccdb57e457cfcb626926383d6..6b9ab2564bcca3bf6e5e04aec228698da3830eb0 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -70,7 +70,6 @@ net-icmp-fix-data-race-in-cmp_global_allow.patch
 hrtimer-annotate-lockless-access-to-timer-state.patch
 spi-fsl-don-t-map-irq-during-probe.patch
 tty-serial-atmel-fix-out-of-range-clock-divider-hand.patch
-serial-sprd-use-readable-macros-instead-of-magic-num.patch
 pinctrl-baytrail-really-serialize-all-register-acces.patch
 net-ena-fix-napi-handler-misbehavior-when-the-napi-budget-is-zero.patch
 net-mlxfw-fix-out-of-memory-error-in-mfa2-flash-burning.patch

diff --git a/queue-4.19/serial-sprd-use-readable-macros-instead-of-magic-num.patch b/queue-4.19/serial-sprd-use-readable-macros-instead-of-magic-num.patch
deleted file mode 100644 (file)
index 376736b..0000000
--- a/queue-4.19/serial-sprd-use-readable-macros-instead-of-magic-num.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From b8917f323e25835c0ac8d02cba9253bcd79040cf Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 4 Dec 2019 20:00:07 +0800
-Subject: serial: sprd: Use readable macros instead of magic number
-
-From: Yonghan Ye <yonghan.ye@unisoc.com>
-
-[ Upstream commit 2b5a997386b0594e671a32c7e429cf59ac8fc54c ]
-
-Define readable macros instead of magic number to make code more readable.
-
-Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
-Acked-by: Chunyan Zhang <chunyan.zhang@spreadtrum.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/tty/serial/sprd_serial.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/drivers/tty/serial/sprd_serial.c b/drivers/tty/serial/sprd_serial.c
-index 2774af86763e..c6cad45cd34b 100644
---- a/drivers/tty/serial/sprd_serial.c
-+++ b/drivers/tty/serial/sprd_serial.c
-@@ -294,6 +294,9 @@ static irqreturn_t sprd_handle_irq(int irq, void *dev_id)
-       if (ims & SPRD_IMSR_TIMEOUT)
-               serial_out(port, SPRD_ICLR, SPRD_ICLR_TIMEOUT);
- 
-+      if (ims & SPRD_IMSR_BREAK_DETECT)
-+              serial_out(port, SPRD_ICLR, SPRD_IMSR_BREAK_DETECT);
-+
-       if (ims & (SPRD_IMSR_RX_FIFO_FULL |
-               SPRD_IMSR_BREAK_DETECT | SPRD_IMSR_TIMEOUT))
-               sprd_rx(port);
--- 
-2.20.1
-

diff --git a/queue-4.19/series b/queue-4.19/series
index 30e11ecdab3163943ed1ac23c1b34f0bf175aa03..4337ae463123992512649347eac2348c6191dac1 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -111,5 +111,4 @@ gtp-fix-an-use-after-free-in-ipv4_pdp_find.patch
 gtp-avoid-zero-size-hashtable.patch
 spi-fsl-don-t-map-irq-during-probe.patch
 tty-serial-atmel-fix-out-of-range-clock-divider-hand.patch
-serial-sprd-use-readable-macros-instead-of-magic-num.patch
 pinctrl-baytrail-really-serialize-all-register-acces.patch

diff --git a/queue-4.4/serial-sprd-use-readable-macros-instead-of-magic-num.patch b/queue-4.4/serial-sprd-use-readable-macros-instead-of-magic-num.patch
deleted file mode 100644 (file)
index cda14c9..0000000
--- a/queue-4.4/serial-sprd-use-readable-macros-instead-of-magic-num.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From e16a9434dc4940d8ade1dbb42ac1c6b452308ed8 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 4 Dec 2019 20:00:07 +0800
-Subject: serial: sprd: Use readable macros instead of magic number
-
-From: Yonghan Ye <yonghan.ye@unisoc.com>
-
-[ Upstream commit 2b5a997386b0594e671a32c7e429cf59ac8fc54c ]
-
-Define readable macros instead of magic number to make code more readable.
-
-Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
-Acked-by: Chunyan Zhang <chunyan.zhang@spreadtrum.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/tty/serial/sprd_serial.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/drivers/tty/serial/sprd_serial.c b/drivers/tty/serial/sprd_serial.c
-index 82e00ac6f7e3..06980857d9e2 100644
---- a/drivers/tty/serial/sprd_serial.c
-+++ b/drivers/tty/serial/sprd_serial.c
-@@ -302,6 +302,9 @@ static irqreturn_t sprd_handle_irq(int irq, void *dev_id)
-       if (ims & SPRD_IMSR_TIMEOUT)
-               serial_out(port, SPRD_ICLR, SPRD_ICLR_TIMEOUT);
- 
-+      if (ims & SPRD_IMSR_BREAK_DETECT)
-+              serial_out(port, SPRD_ICLR, SPRD_IMSR_BREAK_DETECT);
-+
-       if (ims & (SPRD_IMSR_RX_FIFO_FULL |
-               SPRD_IMSR_BREAK_DETECT | SPRD_IMSR_TIMEOUT))
-               sprd_rx(port);
--- 
-2.20.1
-

diff --git a/queue-4.4/series b/queue-4.4/series
index 21872dc01b6957c5f62fbab1991af5757e0c2ba0..0856399eede8ae9a58e6fe659ab4f721640b3017 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -133,5 +133,4 @@ netfilter-ebtables-compat-reject-all-padding-in-matches-watchers.patch
 netfilter-bridge-make-sure-to-pull-arp-header-in-br_nf_forward_arp.patch
 net-icmp-fix-data-race-in-cmp_global_allow.patch
 hrtimer-annotate-lockless-access-to-timer-state.patch
-serial-sprd-use-readable-macros-instead-of-magic-num.patch
 mmc-sdhci-update-the-tuning-failed-messages-to-pr_de.patch

diff --git a/queue-4.9/serial-sprd-use-readable-macros-instead-of-magic-num.patch b/queue-4.9/serial-sprd-use-readable-macros-instead-of-magic-num.patch
deleted file mode 100644 (file)
index 9fab7ae..0000000
--- a/queue-4.9/serial-sprd-use-readable-macros-instead-of-magic-num.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 40b07c218313573e6a5a4175c6f0d032fa5e90e8 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 4 Dec 2019 20:00:07 +0800
-Subject: serial: sprd: Use readable macros instead of magic number
-
-From: Yonghan Ye <yonghan.ye@unisoc.com>
-
-[ Upstream commit 2b5a997386b0594e671a32c7e429cf59ac8fc54c ]
-
-Define readable macros instead of magic number to make code more readable.
-
-Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
-Acked-by: Chunyan Zhang <chunyan.zhang@spreadtrum.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/tty/serial/sprd_serial.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/drivers/tty/serial/sprd_serial.c b/drivers/tty/serial/sprd_serial.c
-index 2e34239ac8a9..ebb1d6658827 100644
---- a/drivers/tty/serial/sprd_serial.c
-+++ b/drivers/tty/serial/sprd_serial.c
-@@ -302,6 +302,9 @@ static irqreturn_t sprd_handle_irq(int irq, void *dev_id)
-       if (ims & SPRD_IMSR_TIMEOUT)
-               serial_out(port, SPRD_ICLR, SPRD_ICLR_TIMEOUT);
- 
-+      if (ims & SPRD_IMSR_BREAK_DETECT)
-+              serial_out(port, SPRD_ICLR, SPRD_IMSR_BREAK_DETECT);
-+
-       if (ims & (SPRD_IMSR_RX_FIFO_FULL |
-               SPRD_IMSR_BREAK_DETECT | SPRD_IMSR_TIMEOUT))
-               sprd_rx(port);
--- 
-2.20.1
-

diff --git a/queue-4.9/series b/queue-4.9/series
index fcbad1f0b59442e17ed71ce3a1ab2c65c3f0075d..53724b00f294b2139db7ae5f2bd2a4a19a0c2c39 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -161,6 +161,5 @@ netfilter-bridge-make-sure-to-pull-arp-header-in-br_nf_forward_arp.patch
 net-icmp-fix-data-race-in-cmp_global_allow.patch
 hrtimer-annotate-lockless-access-to-timer-state.patch
 tty-serial-atmel-fix-out-of-range-clock-divider-hand.patch
-serial-sprd-use-readable-macros-instead-of-magic-num.patch
 pinctrl-baytrail-really-serialize-all-register-acces.patch
 mmc-sdhci-update-the-tuning-failed-messages-to-pr_de.patch