Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Rob Herring <robh@kernel.org>
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Peter Hurley and committed by
Greg Kroah-Hartman
df519e7b 470ca0de

+4 -10
+2 -2
arch/mips/mti-malta/malta-init.c
··· 14 14 #include <linux/init.h> 15 15 #include <linux/string.h> 16 16 #include <linux/kernel.h> 17 - #include <linux/serial_8250.h> 17 + #include <linux/serial_core.h> 18 18 19 19 #include <asm/cacheflush.h> 20 20 #include <asm/smp-ops.h> ··· 75 75 if ((strstr(fw_getcmdline(), "earlycon=")) == NULL) { 76 76 sprintf(console_string, "uart8250,io,0x3f8,%d%c%c", baud, 77 77 parity, bits); 78 - setup_early_serial8250_console(console_string); 78 + setup_earlycon(console_string); 79 79 } 80 80 81 81 if ((strstr(fw_getcmdline(), "console=")) == NULL) {
+2 -2
drivers/firmware/pcdp.c
··· 15 15 #include <linux/console.h> 16 16 #include <linux/efi.h> 17 17 #include <linux/serial.h> 18 - #include <linux/serial_8250.h> 18 + #include <linux/serial_core.h> 19 19 #include <asm/vga.h> 20 20 #include "pcdp.h" 21 21 ··· 43 43 } 44 44 45 45 add_preferred_console("uart", 8250, &options[9]); 46 - return setup_early_serial8250_console(options); 46 + return setup_earlycon(options); 47 47 #else 48 48 return -ENODEV; 49 49 #endif
-5
drivers/tty/serial/8250/8250_early.c
··· 167 167 } 168 168 EARLYCON_DECLARE(uart8250, early_serial8250_setup); 169 169 EARLYCON_DECLARE(uart, early_serial8250_setup); 170 - 171 - int __init setup_early_serial8250_console(char *cmdline) 172 - { 173 - return setup_earlycon(cmdline); 174 - }
-1
include/linux/serial_8250.h
··· 120 120 121 121 extern unsigned int serial8250_early_in(struct uart_port *port, int offset); 122 122 extern void serial8250_early_out(struct uart_port *port, int offset, int value); 123 - extern int setup_early_serial8250_console(char *cmdline); 124 123 extern void serial8250_do_set_termios(struct uart_port *port, 125 124 struct ktermios *termios, struct ktermios *old); 126 125 extern int serial8250_do_startup(struct uart_port *port);