Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7371750 authored by Karthikeyan Ramasubramanian's avatar Karthikeyan Ramasubramanian Committed by Greg Kroah-Hartman
Browse files

tty: serial: qcom_geni_serial: Initialize console port statically 



Perform static initialization of console_port since its initial state has
no run-time dependencies.

Signed-off-by: default avatarKarthikeyan Ramasubramanian <kramasub@codeaurora.org>
Reviewed-by: default avatarMatthias Kaehlcke <mka@chromium.org>
Reviewed-by: default avatarStephen Boyd <swboyd@chromium.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8e70c47c

drivers/tty/serial/qcom_geni_serial.c

+9 −7
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ struct qcom_geni_serial_port { 
	bool brk;

};



static const struct uart_ops qcom_geni_serial_pops;

static const struct uart_ops qcom_geni_console_pops;

static struct uart_driver qcom_geni_console_driver;

static int handle_rx_console(struct uart_port *uport, u32 bytes, bool drop);

static unsigned int qcom_geni_serial_tx_empty(struct uart_port *port);
@@ -118,7 +118,14 @@ static const unsigned long root_freq[] = {7372800, 14745600, 19200000, 29491200, 
#define to_dev_port(ptr, member) \

		container_of(ptr, struct qcom_geni_serial_port, member)



static struct qcom_geni_serial_port qcom_geni_console_port;

static struct qcom_geni_serial_port qcom_geni_console_port = {

	.uport = {

		.iotype = UPIO_MEM,

		.ops = &qcom_geni_console_pops,

		.flags = UPF_BOOT_AUTOCONF,

		.line = 0,

	},

};



static int qcom_geni_serial_request_port(struct uart_port *uport)

{
@@ -1130,11 +1137,6 @@ static int __init qcom_geni_serial_init(void) 
{

	int ret;



	qcom_geni_console_port.uport.iotype = UPIO_MEM;

	qcom_geni_console_port.uport.ops = &qcom_geni_console_pops;

	qcom_geni_console_port.uport.flags = UPF_BOOT_AUTOCONF;

	qcom_geni_console_port.uport.line = 0;



	ret = console_register(&qcom_geni_console_driver);

	if (ret)

		return ret;