disable FB

hc

2024-01-04 1543e317f1da31b75942316931e8f491a8920811

 kernel/drivers/tty/serial/sunsu.c
..
..
@@ -44,10 +44,6 @@
44
44
 #include <asm/prom.h>
45
45
 #include <asm/setup.h>
46
46
 
47
-#if defined(CONFIG_SERIAL_SUNSU_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
48
-#define SUPPORT_SYSRQ
49
-#endif
50
-
51
47
 #include <linux/serial_core.h>
52
48
 #include <linux/sunserialcore.h>
53
49
 
..
..
@@ -518,7 +514,7 @@
518
514
 			switch (ret) {
519
515
 			case 2:
520
516
 				sunsu_change_mouse_baud(up);
521
-				/* fallthru */
517
+				fallthrough;
522
518
 			case 1:
523
519
 				break;
524
520
 
..
..
@@ -1475,6 +1471,7 @@
1475
1471
 
1476
1472
 	up->port.type = PORT_UNKNOWN;
1477
1473
 	up->port.uartclk = (SU_BASE_BAUD * 16);
1474
+	up->port.has_sysrq = IS_ENABLED(CONFIG_SERIAL_SUNSU_CONSOLE);
1478
1475
 
1479
1476
 	err = 0;
1480
1477
 	if (up->su_type == SU_PORT_KBD || up->su_type == SU_PORT_MS) {
..
..
@@ -1503,8 +1500,8 @@
1503
1500
 	up->port.ops = &sunsu_pops;
1504
1501
 
1505
1502
 	ignore_line = false;
1506
-	if (!strcmp(dp->name, "rsc-console") ||
1507
-	    !strcmp(dp->name, "lom-console"))
1503
+	if (of_node_name_eq(dp, "rsc-console") ||
1504
+	    of_node_name_eq(dp, "lom-console"))
1508
1505
 		ignore_line = true;
1509
1506
 
1510
1507
 	sunserial_console_match(SUNSU_CONSOLE(), dp,