Skip to content

Commit

Permalink
serial: 8250_ingenic: Remove __init marking from early write
Browse files Browse the repository at this point in the history
The earlycon would be alive outside the init code in these cases:
1/ we have keep_bootcon in cmdline.
2/ we don't have a real console to switch to.

So remove the __init marking to avoid invalid memory access.

Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Tested-by: Brian Norris <briannorris@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Jeffy Chen authored and Greg Kroah-Hartman committed Jul 30, 2017
1 parent 99d2731 commit 1b7eec2
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/tty/serial/8250/8250_ingenic.c
Original file line number Diff line number Diff line change
Expand Up @@ -50,17 +50,17 @@ static const struct of_device_id of_match[];

static struct earlycon_device *early_device;

static uint8_t __init early_in(struct uart_port *port, int offset)
static uint8_t early_in(struct uart_port *port, int offset)
{
return readl(port->membase + (offset << 2));
}

static void __init early_out(struct uart_port *port, int offset, uint8_t value)
static void early_out(struct uart_port *port, int offset, uint8_t value)
{
writel(value, port->membase + (offset << 2));
}

static void __init ingenic_early_console_putc(struct uart_port *port, int c)
static void ingenic_early_console_putc(struct uart_port *port, int c)
{
uint8_t lsr;

Expand All @@ -71,7 +71,7 @@ static void __init ingenic_early_console_putc(struct uart_port *port, int c)
early_out(port, UART_TX, c);
}

static void __init ingenic_early_console_write(struct console *console,
static void ingenic_early_console_write(struct console *console,
const char *s, unsigned int count)
{
uart_console_write(&early_device->port, s, count,
Expand Down

0 comments on commit 1b7eec2

Please sign in to comment.