Revert "serial: 8250: Add preferred console in serial8250_isa_init_ports()"

This reverts commit a8b04cfe7dad84e65df5996e14b435fd356fe62c.

Let's roll back all of the serial core and printk console changes that
went into 6.10-rc1 as there still are problems with them that need to be
sorted out.

Link: https://lore.kernel.org/r/ZnpRozsdw6zbjqze@tlindgre-MOBL1
Reported-by: Petr Mladek <pmladek@suse.com>
Reported-by: Tony Lindgren <tony@atomide.com>
Cc: Jiri Slaby <jirislaby@kernel.org>
Cc: John Ogness <john.ogness@linutronix.de>
Cc: Sergey Senozhatsky <senozhatsky@chromium.org>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c
index ff15022369e45917278b3807e73f62c679bf0c9c..b0adafc44747deb593b3612730f5cf9a87f6c21f 100644 (file)
--- a/drivers/tty/serial/8250/8250_core.c
+++ b/drivers/tty/serial/8250/8250_core.c
@@ -15,7 +15,6 @@
  */
 
 #include <linux/acpi.h>
-#include <linux/cleanup.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/ioport.h>
@@ -42,8 +41,6 @@
 
 #include <asm/irq.h>
 
-#include "../serial_base.h"    /* For serial_base_add_isa_preferred_console() */
-
 #include "8250.h"
 
 /*
@@ -563,8 +560,6 @@ static void __init serial8250_isa_init_ports(void)
                port->irqflags |= irqflag;
                if (serial8250_isa_config != NULL)
                        serial8250_isa_config(i, &up->port, &up->capabilities);
-
-               serial_base_add_isa_preferred_console(serial8250_reg.dev_name, i);
        }
 }
 

diff --git a/drivers/tty/serial/serial_base.h b/drivers/tty/serial/serial_base.h
index 40af7052b4b64f9c6eb33b90d1214c238d1ecbc1..68a86df984dabe2e6ce7dc8dde1a93149786cfda 100644 (file)
--- a/drivers/tty/serial/serial_base.h
+++ b/drivers/tty/serial/serial_base.h
@@ -55,8 +55,6 @@ void serial_core_unregister_port(struct uart_driver *drv, struct uart_port *port
 int serial_base_add_preferred_console(struct uart_driver *drv,
                                      struct uart_port *port);
 
-int serial_base_add_isa_preferred_console(const char *name, int idx);
-
 #else
 
 static inline
@@ -66,10 +64,4 @@ int serial_base_add_preferred_console(struct uart_driver *drv,
        return 0;
 }
 
-static inline
-int serial_base_add_isa_preferred_console(const char *name, int idx)
-{
-       return 0;
-}
-
 #endif

diff --git a/drivers/tty/serial/serial_base_bus.c b/drivers/tty/serial/serial_base_bus.c
index ae18871c0f3641d4829b660efff6055fa3b56647..1375be3315e6d459dea56b47dd59ad24bd7d48e1 100644 (file)
--- a/drivers/tty/serial/serial_base_bus.c
+++ b/drivers/tty/serial/serial_base_bus.c
@@ -317,27 +317,6 @@ int serial_base_add_preferred_console(struct uart_driver *drv,
        return serial_base_add_one_prefcon(port_match, drv->dev_name, port->line);
 }
 
-#ifdef CONFIG_SERIAL_8250_CONSOLE
-
-/*
- * Early ISA ports initialize the console before there is no struct device.
- * This should be only called from serial8250_isa_init_preferred_console(),
- * other callers are likely wrong and should rely on earlycon instead.
- */
-int serial_base_add_isa_preferred_console(const char *name, int idx)
-{
-       return serial_base_add_prefcon(name, idx);
-}
-
-#else
-
-int serial_base_add_isa_preferred_console(const char *name, int idx)
-{
-       return 0;
-}
-
-#endif
-
 #endif
 
 static int serial_base_init(void)