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:43 +0200
commit3a06bbb3db8bc6e15bd6cdd9bd020c5fe6bfda20 (patch)
tree9b8b871a3889d0a2c113c1e73bb9c932b26ed926
parent8fc48a6fb36e3cf034d95af3549587e43e02ae26 (diff)
serial: uartps: Do not add a trailing semicolon to macro
(bsc#1051510).
-rw-r--r--patches.drivers/serial-uartps-Do-not-add-a-trailing-semicolon-to-mac.patch39
-rw-r--r--series.conf1
2 files changed, 40 insertions, 0 deletions
diff --git a/patches.drivers/serial-uartps-Do-not-add-a-trailing-semicolon-to-mac.patch b/patches.drivers/serial-uartps-Do-not-add-a-trailing-semicolon-to-mac.patch
new file mode 100644
index 0000000000..ae29af6cce
--- /dev/null
+++ b/patches.drivers/serial-uartps-Do-not-add-a-trailing-semicolon-to-mac.patch
@@ -0,0 +1,39 @@
+From 7be7a0145f01393e487aef8123902e08e7286a45 Mon Sep 17 00:00:00 2001
+From: Nava kishore Manne <nava.manne@xilinx.com>
+Date: Wed, 12 Jun 2019 13:14:42 +0200
+Subject: [PATCH] serial: uartps: Do not add a trailing semicolon to macro
+Git-commit: 7be7a0145f01393e487aef8123902e08e7286a45
+Patch-mainline: v5.3-rc1
+References: bsc#1051510
+
+This patch fixes this checkpatch warning:
+Warning: macros should not use a trailing semicolon
++#define to_cdns_uart(_nb) container_of(_nb, struct cdns_uart, \
++ clk_rate_change_nb);
+
+Fixes: d9bb3fb12685 ("tty: xuartps: Rebrand driver as Cadence UART")
+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, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c
+index 69ed81d1338b..e6f23fbf077a 100644
+--- a/drivers/tty/serial/xilinx_uartps.c
++++ b/drivers/tty/serial/xilinx_uartps.c
+@@ -201,7 +201,7 @@ struct cdns_platform_data {
+ u32 quirks;
+ };
+ #define to_cdns_uart(_nb) container_of(_nb, struct cdns_uart, \
+- clk_rate_change_nb);
++ clk_rate_change_nb)
+
+ /**
+ * cdns_uart_handle_rx - Handle the received bytes along with Rx errors.
+--
+2.16.4
+
diff --git a/series.conf b/series.conf
index b0cf577cad..9a106425f6 100644
--- a/series.conf
+++ b/series.conf
@@ -22913,6 +22913,7 @@
patches.drivers/staging-comedi-dt282x-fix-a-null-pointer-deref-on-in.patch
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/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