[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1420708545-6477-1-git-send-email-pramod.gurav@smartplayin.com>
Date: Thu, 8 Jan 2015 14:45:45 +0530
From: Pramod Gurav <pramod.gurav@...rtplayin.com>
To: Stephen Boyd <sboyd@...eaurora.org>
Cc: David Brown <davidb@...eaurora.org>,
Daniel Walker <dwalker@...o99.com>,
Bryan Huntsman <bryanh@...eaurora.org>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
Jiri Slaby <jslaby@...e.cz>, linux-arm-msm@...r.kernel.org,
linux-serial@...r.kernel.org, linux-kernel@...r.kernel.org,
Pramod Gurav <pramod.gurav@...rtplayin.com>
Subject: [PATCH v2] tty: serial: msm_serial: Remove duplicate code in msm_console_setup
The changes done here are already being done somewhere else in code.
- The function msm_init_clock() is also called while doing msm_startup
hence removing.
- msm_set_baud_rate() is anyway called in uart_set_options when it calls
msm_set_termios(). msm_reset() is called when we change the baud rate.
Hence doing away with both of these calls.
- CR_CMD_PROTECTION_EN and CR_TX_ENABLE settings are done in msm_set_baud_rate.
So do away with this here.
Signed-off-by: Pramod Gurav <pramod.gurav@...rtplayin.com>
---
Changes since v1:
- v1 was just removing call to msm_set_baud_rate(). Other code is removed on review
comments from Stephen Boyd here [1].
- Removed call to msm_init_clock() as it is called while doing msm_startup
Tested on ifc6410 console.
[1]: https://patchwork.kernel.org/patch/5527551/
drivers/tty/serial/msm_serial.c | 15 ---------------
1 file changed, 15 deletions(-)
diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c
index c88b522..057008d 100644
--- a/drivers/tty/serial/msm_serial.c
+++ b/drivers/tty/serial/msm_serial.c
@@ -932,27 +932,12 @@ static int __init msm_console_setup(struct console *co, char *options)
if (unlikely(!port->membase))
return -ENXIO;
- msm_init_clock(port);
-
if (options)
uart_parse_options(options, &baud, &parity, &bits, &flow);
bits = 8;
parity = 'n';
flow = 'n';
- msm_write(port, UART_MR2_BITS_PER_CHAR_8 | UART_MR2_STOP_BIT_LEN_ONE,
- UART_MR2); /* 8N1 */
-
- if (baud < 300 || baud > 115200)
- baud = 115200;
- msm_set_baud_rate(port, baud);
-
- msm_reset(port);
-
- if (msm_port->is_uartdm) {
- msm_write(port, UART_CR_CMD_PROTECTION_EN, UART_CR);
- msm_write(port, UART_CR_TX_ENABLE, UART_CR);
- }
pr_info("msm_serial: console setup on port #%d\n", port->line);
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists