Commit 740a7967 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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

This reverts commit a8b04cfe.

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: default avatarPetr Mladek <pmladek@suse.com>
Reported-by: default avatarTony 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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 12b7210e

drivers/tty/serial/8250/8250_core.c

+0 −5
Original line number Diff line number Diff line
@@ -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);

	}

}

drivers/tty/serial/serial_base.h

+0 −8
Original line number Diff line number Diff line
@@ -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

drivers/tty/serial/serial_base_bus.c

+0 −21
Original line number Diff line number Diff line
@@ -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)