OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tty: xuartps: Beautify read-modify writes 

Non-functional, formatting changes to ease reading the code.

Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
Reviewed-by: Peter Hurley <peter@hurleysoftware.com>
Reviewed-by: Moritz Fischer <moritz.fischer@ettus.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Soren Brinkmann 2015-12-26 02:43:49 -08:00 committed by Greg Kroah-Hartman
parent 0b0cced19a
commit e3538c37ee
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/tty/serial/xilinx_uartps.c
View File

@ -515,12 +515,14 @@ static void cdns_uart_start_tx(struct uart_port *port)
if (uart_circ_empty(&port->state->xmit) || uart_tx_stopped(port)) if (uart_circ_empty(&port->state->xmit) || uart_tx_stopped(port))
return; return;
status = readl(port->membase + CDNS_UART_CR_OFFSET); /*
/* Set the TX enable bit and clear the TX disable bit to enable the * Set the TX enable bit and clear the TX disable bit to enable the
* transmitter. * transmitter.
*/ */
writel((status & ~CDNS_UART_CR_TX_DIS) | CDNS_UART_CR_TX_EN, status = readl(port->membase + CDNS_UART_CR_OFFSET);
port->membase + CDNS_UART_CR_OFFSET); status &= ~CDNS_UART_CR_TX_DIS;
status |= CDNS_UART_CR_TX_EN;
writel(status, port->membase + CDNS_UART_CR_OFFSET);
while (numbytes-- && ((readl(port->membase + CDNS_UART_SR_OFFSET) & while (numbytes-- && ((readl(port->membase + CDNS_UART_SR_OFFSET) &
CDNS_UART_SR_TXFULL)) != CDNS_UART_SR_TXFULL) { CDNS_UART_SR_TXFULL)) != CDNS_UART_SR_TXFULL) {
@ -1123,8 +1125,9 @@ static void cdns_uart_console_write(struct console *co, const char *s,
* clear the TX disable bit to enable the transmitter. * clear the TX disable bit to enable the transmitter.
*/ */
ctrl = readl(port->membase + CDNS_UART_CR_OFFSET); ctrl = readl(port->membase + CDNS_UART_CR_OFFSET);
writel((ctrl & ~CDNS_UART_CR_TX_DIS) | CDNS_UART_CR_TX_EN, ctrl &= ~CDNS_UART_CR_TX_DIS;
port->membase + CDNS_UART_CR_OFFSET); ctrl |= CDNS_UART_CR_TX_EN;
writel(ctrl, port->membase + CDNS_UART_CR_OFFSET);
uart_console_write(port, s, count, cdns_uart_console_putchar); uart_console_write(port, s, count, cdns_uart_console_putchar);
cdns_uart_console_wait_tx(port); cdns_uart_console_wait_tx(port);