summarylogtreecommitdiffstats
path: root/0008-kernel-6.3-tty_port_operations-int-to-bool.patch
blob: e6c7b56259238e4600d2f74975eccfd107fd1261 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
diff -pNaru5 a/serial_core.c b/serial_core.c
--- a/serial_core.c	2023-12-18 13:29:22.522209521 -0500
+++ b/serial_core.c	2023-12-18 13:29:42.488180604 -0500
@@ -1647,11 +1647,15 @@ static void uart_port_shutdown(struct tt
 	 * Ensure that the IRQ handler isn't running on another CPU.
 	 */
 	synchronize_irq(uport->irq);
 }
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,3,0)
 static int uart_carrier_raised(struct tty_port *port)
+#else
+static bool uart_carrier_raised(struct tty_port *port)
+#endif
 {
 	struct uart_state *state = container_of(port, struct uart_state, port);
 	struct uart_port *uport = state->uart_port;
 	int mctrl;
 	spin_lock_irq(&uport->lock);
@@ -1661,11 +1665,15 @@ static int uart_carrier_raised(struct tt
 	if (mctrl & TIOCM_CAR)
 		return 1;
 	return 0;
 }
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,3,0)
 static void uart_dtr_rts(struct tty_port *port, int onoff)
+#else
+static void uart_dtr_rts(struct tty_port *port, bool onoff)
+#endif
 {
 	struct uart_state *state = container_of(port, struct uart_state, port);
 	struct uart_port *uport = state->uart_port;
 
 	if (onoff)