aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-04-30 11:24:12 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-04-30 11:24:12 +0200
commit37b6a3d7c16dc13d6b508c2abcabd05a1f931157 (patch)
treed7f4ecaf583254703720ac2a100aef6c28239458
parent407c135aa295a6b60d54743a78ce730d5690daa7 (diff)
downloadstable-queue-37b6a3d7c16dc13d6b508c2abcabd05a1f931157.tar.gz
5.4-stable patches
added patches: serial-core-fix-kernel-doc-for-uart_port_unlock_irqrestore.patch
-rw-r--r--queue-5.4/serial-core-fix-kernel-doc-for-uart_port_unlock_irqrestore.patch38
-rw-r--r--queue-5.4/series1
2 files changed, 39 insertions, 0 deletions
diff --git a/queue-5.4/serial-core-fix-kernel-doc-for-uart_port_unlock_irqrestore.patch b/queue-5.4/serial-core-fix-kernel-doc-for-uart_port_unlock_irqrestore.patch
new file mode 100644
index 0000000000..e103562030
--- /dev/null
+++ b/queue-5.4/serial-core-fix-kernel-doc-for-uart_port_unlock_irqrestore.patch
@@ -0,0 +1,38 @@
+From 29bff582b74ed0bdb7e6986482ad9e6799ea4d2f Mon Sep 17 00:00:00 2001
+From: Randy Dunlap <rdunlap@infradead.org>
+Date: Tue, 26 Sep 2023 21:41:28 -0700
+Subject: serial: core: fix kernel-doc for uart_port_unlock_irqrestore()
+
+From: Randy Dunlap <rdunlap@infradead.org>
+
+commit 29bff582b74ed0bdb7e6986482ad9e6799ea4d2f upstream.
+
+Fix the function name to avoid a kernel-doc warning:
+
+include/linux/serial_core.h:666: warning: expecting prototype for uart_port_lock_irqrestore(). Prototype was for uart_port_unlock_irqrestore() instead
+
+Fixes: b0af4bcb4946 ("serial: core: Provide port lock wrappers")
+Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
+Cc: Thomas Gleixner <tglx@linutronix.de>
+Cc: John Ogness <john.ogness@linutronix.de>
+Cc: linux-serial@vger.kernel.org
+Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Cc: Jiri Slaby <jirislaby@kernel.org>
+Reviewed-by: John Ogness <john.ogness@linutronix.de>
+Link: https://lore.kernel.org/r/20230927044128.4748-1-rdunlap@infradead.org
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ include/linux/serial_core.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/include/linux/serial_core.h
++++ b/include/linux/serial_core.h
+@@ -325,7 +325,7 @@ static inline void uart_port_unlock_irq(
+ }
+
+ /**
+- * uart_port_lock_irqrestore - Unlock the UART port, restore interrupts
++ * uart_port_unlock_irqrestore - Unlock the UART port, restore interrupts
+ * @up: Pointer to UART port structure
+ * @flags: The saved interrupt flags for restore
+ */
diff --git a/queue-5.4/series b/queue-5.4/series
index c882ad2944..5c063f1bef 100644
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -104,3 +104,4 @@ hid-i2c-hid-remove-i2c_hid_read_pending-flag-to-prevent-lock-up.patch
bounds-use-the-right-number-of-bits-for-power-of-two-config_nr_cpus.patch
dm-limit-the-number-of-targets-and-parameter-size-area.patch
udp-preserve-the-connected-status-if-only-udp-cmsg.patch
+serial-core-fix-kernel-doc-for-uart_port_unlock_irqrestore.patch