write in 30M

hc

2024-02-20 ea08eeccae9297f7aabd2ef7f0c2517ac4549acc

 kernel/drivers/tty/serial/pic32_uart.c
..
..
@@ -618,7 +618,7 @@
618
618
 				"pic32_uart_mem"))
619
619
 		return -EBUSY;
620
620
 
621
-	port->membase = devm_ioremap_nocache(port->dev, port->mapbase,
621
+	port->membase = devm_ioremap(port->dev, port->mapbase,
622
622
 						resource_size(res_mem));
623
623
 	if (!port->membase) {
624
624
 		dev_err(port->dev, "Unable to map registers\n");
..
..
@@ -768,11 +768,6 @@
768
768
 }
769
769
 console_initcall(pic32_console_init);
770
770
 
771
-static inline bool is_pic32_console_port(struct uart_port *port)
772
-{
773
-	return port->cons && port->cons->index == port->line;
774
-}
775
-
776
771
 /*
777
772
  * Late console initialization.
778
773
  */
..
..
@@ -873,8 +868,7 @@
873
868
 	}
874
869
 
875
870
 #ifdef CONFIG_SERIAL_PIC32_CONSOLE
876
-	if (is_pic32_console_port(port) &&
877
-	    (pic32_console.flags & CON_ENABLED)) {
871
+	if (uart_console(port) && (pic32_console.flags & CON_ENABLED)) {
878
872
 		/* The peripheral clock has been enabled by console_setup,
879
873
 		 * so disable it till the port is used.
880
874
 		 */