disable FB

hc

2024-01-04 1543e317f1da31b75942316931e8f491a8920811

 kernel/drivers/tty/serial/mpc52xx_uart.c
..
..
@@ -44,10 +44,6 @@
44
44
 #include <asm/mpc52xx.h>
45
45
 #include <asm/mpc52xx_psc.h>
46
46
 
47
-#if defined(CONFIG_SERIAL_MPC52xx_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
48
-#define SUPPORT_SYSRQ
49
-#endif
50
-
51
47
 #include <linux/serial_core.h>
52
48
 
53
49
 
..
..
@@ -1382,12 +1378,8 @@
1382
1378
 		ch = psc_ops->read_char(port);
1383
1379
 
1384
1380
 		/* Handle sysreq char */
1385
-#ifdef SUPPORT_SYSRQ
1386
-		if (uart_handle_sysrq_char(port, ch)) {
1387
-			port->sysrq = 0;
1381
+		if (uart_handle_sysrq_char(port, ch))
1388
1382
 			continue;
1389
-		}
1390
-#endif
1391
1383
 
1392
1384
 		/* Store it */
1393
1385
 
..
..
@@ -1770,6 +1762,7 @@
1770
1762
 	spin_lock_init(&port->lock);
1771
1763
 	port->uartclk = uartclk;
1772
1764
 	port->fifosize	= 512;
1765
+	port->has_sysrq = IS_ENABLED(CONFIG_SERIAL_MPC52xx_CONSOLE);
1773
1766
 	port->iotype	= UPIO_MEM;
1774
1767
 	port->flags	= UPF_BOOT_AUTOCONF |
1775
1768
 			  (uart_console(port) ? 0 : UPF_IOREMAP);