diff options
author | Peter Hurley <peter@hurleysoftware.com> | 2015-03-09 16:27:22 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-26 12:25:27 -0400 |
commit | df519e7bd33cf56d8a5ce357dfb94248d427b688 (patch) | |
tree | 34501d53c221f1c76e42b619bb5618b51d0ac6f8 | |
parent | 470ca0de69feaba5df215ad804cec1859883a5ed (diff) |
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>
-rw-r--r-- | arch/mips/mti-malta/malta-init.c | 4 | ||||
-rw-r--r-- | drivers/firmware/pcdp.c | 4 | ||||
-rw-r--r-- | drivers/tty/serial/8250/8250_early.c | 5 | ||||
-rw-r--r-- | include/linux/serial_8250.h | 1 |
4 files changed, 4 insertions, 10 deletions
diff --git a/arch/mips/mti-malta/malta-init.c b/arch/mips/mti-malta/malta-init.c index 6849f533154f..cec3e187c48f 100644 --- a/arch/mips/mti-malta/malta-init.c +++ b/arch/mips/mti-malta/malta-init.c | |||
@@ -14,7 +14,7 @@ | |||
14 | #include <linux/init.h> | 14 | #include <linux/init.h> |
15 | #include <linux/string.h> | 15 | #include <linux/string.h> |
16 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
17 | #include <linux/serial_8250.h> | 17 | #include <linux/serial_core.h> |
18 | 18 | ||
19 | #include <asm/cacheflush.h> | 19 | #include <asm/cacheflush.h> |
20 | #include <asm/smp-ops.h> | 20 | #include <asm/smp-ops.h> |
@@ -75,7 +75,7 @@ static void __init console_config(void) | |||
75 | if ((strstr(fw_getcmdline(), "earlycon=")) == NULL) { | 75 | if ((strstr(fw_getcmdline(), "earlycon=")) == NULL) { |
76 | sprintf(console_string, "uart8250,io,0x3f8,%d%c%c", baud, | 76 | sprintf(console_string, "uart8250,io,0x3f8,%d%c%c", baud, |
77 | parity, bits); | 77 | parity, bits); |
78 | setup_early_serial8250_console(console_string); | 78 | setup_earlycon(console_string); |
79 | } | 79 | } |
80 | 80 | ||
81 | if ((strstr(fw_getcmdline(), "console=")) == NULL) { | 81 | if ((strstr(fw_getcmdline(), "console=")) == NULL) { |
diff --git a/drivers/firmware/pcdp.c b/drivers/firmware/pcdp.c index a330492e06f9..75273a251603 100644 --- a/drivers/firmware/pcdp.c +++ b/drivers/firmware/pcdp.c | |||
@@ -15,7 +15,7 @@ | |||
15 | #include <linux/console.h> | 15 | #include <linux/console.h> |
16 | #include <linux/efi.h> | 16 | #include <linux/efi.h> |
17 | #include <linux/serial.h> | 17 | #include <linux/serial.h> |
18 | #include <linux/serial_8250.h> | 18 | #include <linux/serial_core.h> |
19 | #include <asm/vga.h> | 19 | #include <asm/vga.h> |
20 | #include "pcdp.h" | 20 | #include "pcdp.h" |
21 | 21 | ||
@@ -43,7 +43,7 @@ setup_serial_console(struct pcdp_uart *uart) | |||
43 | } | 43 | } |
44 | 44 | ||
45 | add_preferred_console("uart", 8250, &options[9]); | 45 | add_preferred_console("uart", 8250, &options[9]); |
46 | return setup_early_serial8250_console(options); | 46 | return setup_earlycon(options); |
47 | #else | 47 | #else |
48 | return -ENODEV; | 48 | return -ENODEV; |
49 | #endif | 49 | #endif |
diff --git a/drivers/tty/serial/8250/8250_early.c b/drivers/tty/serial/8250/8250_early.c index d272139a5729..a2b4e58690ba 100644 --- a/drivers/tty/serial/8250/8250_early.c +++ b/drivers/tty/serial/8250/8250_early.c | |||
@@ -167,8 +167,3 @@ static int __init early_serial8250_setup(struct earlycon_device *device, | |||
167 | } | 167 | } |
168 | EARLYCON_DECLARE(uart8250, early_serial8250_setup); | 168 | EARLYCON_DECLARE(uart8250, early_serial8250_setup); |
169 | EARLYCON_DECLARE(uart, early_serial8250_setup); | 169 | EARLYCON_DECLARE(uart, early_serial8250_setup); |
170 | |||
171 | int __init setup_early_serial8250_console(char *cmdline) | ||
172 | { | ||
173 | return setup_earlycon(cmdline); | ||
174 | } | ||
diff --git a/include/linux/serial_8250.h b/include/linux/serial_8250.h index f26ae7fa30ae..ca9f87beac63 100644 --- a/include/linux/serial_8250.h +++ b/include/linux/serial_8250.h | |||
@@ -120,7 +120,6 @@ extern int early_serial_setup(struct uart_port *port); | |||
120 | 120 | ||
121 | extern unsigned int serial8250_early_in(struct uart_port *port, int offset); | 121 | extern unsigned int serial8250_early_in(struct uart_port *port, int offset); |
122 | extern void serial8250_early_out(struct uart_port *port, int offset, int value); | 122 | extern void serial8250_early_out(struct uart_port *port, int offset, int value); |
123 | extern int setup_early_serial8250_console(char *cmdline); | ||
124 | extern void serial8250_do_set_termios(struct uart_port *port, | 123 | extern void serial8250_do_set_termios(struct uart_port *port, |
125 | struct ktermios *termios, struct ktermios *old); | 124 | struct ktermios *termios, struct ktermios *old); |
126 | extern int serial8250_do_startup(struct uart_port *port); | 125 | extern int serial8250_do_startup(struct uart_port *port); |