Home Home > GIT Browse > SLE15
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-07-16 16:19:33 +0200
committerTakashi Iwai <tiwai@suse.de>2019-07-16 16:19:47 +0200
commit4fe091fe5e8cab1d03033fd75b38a31c4c327e2a (patch)
tree673e1e3dffebd6098ca4619e125d12dee57f7ffe
parent3a06bbb3db8bc6e15bd6cdd9bd020c5fe6bfda20 (diff)
serial: uartps: Remove useless return from
cdns_uart_poll_put_char (bsc#1051510).
-rw-r--r--patches.drivers/serial-uartps-Remove-useless-return-from-cdns_uart_p.patch42
-rw-r--r--series.conf1
2 files changed, 43 insertions, 0 deletions
diff --git a/patches.drivers/serial-uartps-Remove-useless-return-from-cdns_uart_p.patch b/patches.drivers/serial-uartps-Remove-useless-return-from-cdns_uart_p.patch
new file mode 100644
index 0000000000..c4d6db5f0d
--- /dev/null
+++ b/patches.drivers/serial-uartps-Remove-useless-return-from-cdns_uart_p.patch
@@ -0,0 +1,42 @@
+From 8d53935d9beb4b9b51fdae9296e4a7840214a64a Mon Sep 17 00:00:00 2001
+From: Nava kishore Manne <nava.manne@xilinx.com>
+Date: Wed, 12 Jun 2019 13:14:43 +0200
+Subject: [PATCH] serial: uartps: Remove useless return from cdns_uart_poll_put_char
+Git-commit: 8d53935d9beb4b9b51fdae9296e4a7840214a64a
+Patch-mainline: v5.3-rc1
+References: bsc#1051510
+
+There is no reason to call return at the end of function which should
+return void.
+
+The patch is also remove one checkpatch warning:
+Warning: void function return statements are not generally useful
++ return;
++}
+
+Fixes: 6ee04c6c5488 ("tty: xuartps: Add polled mode support for xuartps")
+Signed-off-by: Nava kishore Manne <nava.manne@xilinx.com>
+Signed-off-by: Michal Simek <michal.simek@xilinx.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Acked-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ drivers/tty/serial/xilinx_uartps.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c
+index e6f23fbf077a..f145946f659b 100644
+--- a/drivers/tty/serial/xilinx_uartps.c
++++ b/drivers/tty/serial/xilinx_uartps.c
+@@ -1079,8 +1079,6 @@ static void cdns_uart_poll_put_char(struct uart_port *port, unsigned char c)
+ cpu_relax();
+
+ spin_unlock_irqrestore(&port->lock, flags);
+-
+- return;
+ }
+ #endif
+
+--
+2.16.4
+
diff --git a/series.conf b/series.conf
index 9a106425f6..1aa2fc553b 100644
--- a/series.conf
+++ b/series.conf
@@ -22914,6 +22914,7 @@
patches.drivers/serial-uartps-Fix-multiple-line-dereference.patch
patches.drivers/serial-uartps-Fix-long-line-over-80-chars.patch
patches.drivers/serial-uartps-Do-not-add-a-trailing-semicolon-to-mac.patch
+ patches.drivers/serial-uartps-Remove-useless-return-from-cdns_uart_p.patch
patches.drivers/memstick-Fix-error-cleanup-path-of-memstick_init.patch
patches.fixes/0001-ocfs2-add-last-unlock-times-in-locking_state.patch
patches.fixes/0002-ocfs2-add-locking-filter-debugfs-file.patch