Commit df519e7b authored by Peter Hurley's avatar Peter Hurley Committed by Greg Kroah-Hartman

serial: 8250_early: Remove setup_early_serial8250_console()

setup_earlycon() will now match and register the desired earlycon
from the param string (as if 'earlycon=...' had been set on the
command line). Use setup_earlycon() from existing arch call sites
which start an earlycon directly.
Acked-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarPeter Hurley <peter@hurleysoftware.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 470ca0de
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/string.h> #include <linux/string.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/serial_8250.h> #include <linux/serial_core.h>
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
#include <asm/smp-ops.h> #include <asm/smp-ops.h>
...@@ -75,7 +75,7 @@ static void __init console_config(void) ...@@ -75,7 +75,7 @@ static void __init console_config(void)
if ((strstr(fw_getcmdline(), "earlycon=")) == NULL) { if ((strstr(fw_getcmdline(), "earlycon=")) == NULL) {
sprintf(console_string, "uart8250,io,0x3f8,%d%c%c", baud, sprintf(console_string, "uart8250,io,0x3f8,%d%c%c", baud,
parity, bits); parity, bits);
setup_early_serial8250_console(console_string); setup_earlycon(console_string);
} }
if ((strstr(fw_getcmdline(), "console=")) == NULL) { if ((strstr(fw_getcmdline(), "console=")) == NULL) {
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#include <linux/console.h> #include <linux/console.h>
#include <linux/efi.h> #include <linux/efi.h>
#include <linux/serial.h> #include <linux/serial.h>
#include <linux/serial_8250.h> #include <linux/serial_core.h>
#include <asm/vga.h> #include <asm/vga.h>
#include "pcdp.h" #include "pcdp.h"
...@@ -43,7 +43,7 @@ setup_serial_console(struct pcdp_uart *uart) ...@@ -43,7 +43,7 @@ setup_serial_console(struct pcdp_uart *uart)
} }
add_preferred_console("uart", 8250, &options[9]); add_preferred_console("uart", 8250, &options[9]);
return setup_early_serial8250_console(options); return setup_earlycon(options);
#else #else
return -ENODEV; return -ENODEV;
#endif #endif
......
...@@ -167,8 +167,3 @@ static int __init early_serial8250_setup(struct earlycon_device *device, ...@@ -167,8 +167,3 @@ static int __init early_serial8250_setup(struct earlycon_device *device,
} }
EARLYCON_DECLARE(uart8250, early_serial8250_setup); EARLYCON_DECLARE(uart8250, early_serial8250_setup);
EARLYCON_DECLARE(uart, early_serial8250_setup); EARLYCON_DECLARE(uart, early_serial8250_setup);
int __init setup_early_serial8250_console(char *cmdline)
{
return setup_earlycon(cmdline);
}
...@@ -120,7 +120,6 @@ extern int early_serial_setup(struct uart_port *port); ...@@ -120,7 +120,6 @@ extern int early_serial_setup(struct uart_port *port);
extern unsigned int serial8250_early_in(struct uart_port *port, int offset); extern unsigned int serial8250_early_in(struct uart_port *port, int offset);
extern void serial8250_early_out(struct uart_port *port, int offset, int value); extern void serial8250_early_out(struct uart_port *port, int offset, int value);
extern int setup_early_serial8250_console(char *cmdline);
extern void serial8250_do_set_termios(struct uart_port *port, extern void serial8250_do_set_termios(struct uart_port *port,
struct ktermios *termios, struct ktermios *old); struct ktermios *termios, struct ktermios *old);
extern int serial8250_do_startup(struct uart_port *port); extern int serial8250_do_startup(struct uart_port *port);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment