disable FB

hc

2024-01-04 1543e317f1da31b75942316931e8f491a8920811

 kernel/drivers/tty/serial/amba-pl010.c
..
..
@@ -15,10 +15,6 @@
15
15
  * and hooked into this driver.
16
16
  */
17
17
 
18
-#if defined(CONFIG_SERIAL_AMBA_PL010_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
19
-#define SUPPORT_SYSRQ
20
-#endif
21
-
22
18
 #include <linux/module.h>
23
19
 #include <linux/ioport.h>
24
20
 #include <linux/init.h>
..
..
@@ -725,6 +721,7 @@
725
721
 	uap->port.iotype = UPIO_MEM;
726
722
 	uap->port.irq = dev->irq[0];
727
723
 	uap->port.fifosize = 16;
724
+	uap->port.has_sysrq = IS_ENABLED(CONFIG_SERIAL_AMBA_PL010_CONSOLE);
728
725
 	uap->port.ops = &amba_pl010_pops;
729
726
 	uap->port.flags = UPF_BOOT_AUTOCONF;
730
727
 	uap->port.line = i;
..
..
@@ -754,7 +751,7 @@
754
751
 	return ret;
755
752
 }
756
753
 
757
-static int pl010_remove(struct amba_device *dev)
754
+static void pl010_remove(struct amba_device *dev)
758
755
 {
759
756
 	struct uart_amba_port *uap = amba_get_drvdata(dev);
760
757
 	int i;
..
..
@@ -770,8 +767,6 @@
770
767
 
771
768
 	if (!busy)
772
769
 		uart_unregister_driver(&amba_reg);
773
-
774
-	return 0;
775
770
 }
776
771
 
777
772
 #ifdef CONFIG_PM_SLEEP