write in 30M

hc

2024-02-20 ea08eeccae9297f7aabd2ef7f0c2517ac4549acc

 kernel/drivers/tty/serial/arc_uart.c
..
..
@@ -21,10 +21,6 @@
21
21
  *  -check if sysreq works
22
22
  */
23
23
 
24
-#if defined(CONFIG_SERIAL_ARC_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
25
-#define SUPPORT_SYSRQ
26
-#endif
27
-
28
24
 #include <linux/module.h>
29
25
 #include <linux/serial.h>
30
26
 #include <linux/console.h>
..
..
@@ -613,10 +609,11 @@
613
609
 	}
614
610
 	uart->baud = val;
615
611
 
616
-	port->membase = of_iomap(np, 0);
617
-	if (!port->membase)
612
+	port->membase = devm_platform_ioremap_resource(pdev, 0);
613
+	if (IS_ERR(port->membase)) {
618
614
 		/* No point of dev_err since UART itself is hosed here */
619
-		return -ENXIO;
615
+		return PTR_ERR(port->membase);
616
+	}
620
617
 
621
618
 	port->irq = irq_of_parse_and_map(np, 0);
622
619
 
..
..
@@ -625,6 +622,7 @@
625
622
 	port->flags = UPF_BOOT_AUTOCONF;
626
623
 	port->line = dev_id;
627
624
 	port->ops = &arc_serial_pops;
625
+	port->has_sysrq = IS_ENABLED(CONFIG_SERIAL_ARC_CONSOLE);
628
626
 
629
627
 	port->fifosize = ARC_UART_TX_FIFO_SIZE;
630
628