iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "serial: 8250: Fix add preferred console for serial8250_isa_init_ports()"

Browse Source 
This reverts commit 4547cd76f08a6f301f6ad563f5d0e4566924ec6b.

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>
This commit is contained in:
Greg Kroah-Hartman 2024-06-25 07:57:48 +02:00
parent 7312b740b7
commit 3ddbc427df
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/tty/serial/serial_base.h
View File

@ -55,6 +55,8 @@ 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
@ -64,14 +66,6 @@ int serial_base_add_preferred_console(struct uart_driver *drv,
return 0;
}
#endif
#ifdef CONFIG_SERIAL_8250_CONSOLE
int serial_base_add_isa_preferred_console(const char *name, int idx);
#else
static inline
int serial_base_add_isa_preferred_console(const char *name, int idx)
{

11
drivers/tty/serial/serial_base_bus.c
View File

@ -219,8 +219,6 @@ static int serial_base_add_one_prefcon(const char *match, const char *dev_name,
return ret;
}
#endif
#ifdef __sparc__
/* Handle Sparc ttya and ttyb options as done in console_setup() */
@ -331,6 +329,15 @@ 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)