of: earlycon: Fixup earlycon console name and index

Use the console name embedded in the OF earlycon table by the
OF_EARLYCON_DECLARE() macro to initialize the struct console 'name'
and 'index' fields.

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

3 files changed, 5 insertions, 6 deletions

diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index 168611867611..ec1459517de6 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -838,7 +838,7 @@ static int __init early_init_dt_scan_chosen_serial(void)
                 if (addr == OF_BAD_ADDR)
                         return -ENXIO;
 
-                of_setup_earlycon(addr, match->setup);
+                of_setup_earlycon(addr, match);
                 return 0;
         }
         return -ENODEV;
diff --git a/drivers/tty/serial/earlycon.c b/drivers/tty/serial/earlycon.c
index 90b064faa1c4..47e54deb944b 100644
--- a/drivers/tty/serial/earlycon.c
+++ b/drivers/tty/serial/earlycon.c
@@ -218,7 +218,7 @@ early_param("earlycon", param_setup_earlycon);
 #ifdef CONFIG_OF_EARLY_FLATTREE
 
 int __init of_setup_earlycon(unsigned long addr,
-                             int (*setup)(struct earlycon_device *, const char *))
+                             const struct earlycon_id *match)
 {
         int err;
         struct uart_port *port = &early_console_dev.port;
@@ -229,8 +229,8 @@ int __init of_setup_earlycon(unsigned long addr,
         port->uartclk = BASE_BAUD * 16;
         port->membase = earlycon_map(addr, SZ_4K);
 
-        early_console_dev.con->data = &early_console_dev;
-        err = setup(&early_console_dev, NULL);
+        earlycon_init(&early_console_dev, match->name);
+        err = match->setup(&early_console_dev, NULL);
         if (err < 0)
                 return err;
         if (!early_console_dev.con->write)
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index 25e05147f379..63fdb55e4c9d 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -359,8 +359,7 @@ extern const struct earlycon_id __earlycon_table_end[];
 #define EARLYCON_DECLARE(_name, fn)     OF_EARLYCON_DECLARE(_name, "", fn)
 
 extern int setup_earlycon(char *buf);
-extern int of_setup_earlycon(unsigned long addr,
-                             int (*setup)(struct earlycon_device *, const char *));
+extern int of_setup_earlycon(unsigned long addr, const struct earlycon_id *match);
 
 struct uart_port *uart_get_console(struct uart_port *ports, int nr,
                                    struct console *c);