lkml.org 
[lkml]   [2015]   [Nov]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATH RESEND v2 01/10] tty: xuartps: Beautify read-modify writes
    Date
    Non-functional, formatting changes to ease reading the code.

    Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
    ---
    drivers/tty/serial/xilinx_uartps.c | 15 +++++++++------
    1 file changed, 9 insertions(+), 6 deletions(-)

    diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c
    index 009e0dbc12d2..50d4082d2354 100644
    --- a/drivers/tty/serial/xilinx_uartps.c
    +++ b/drivers/tty/serial/xilinx_uartps.c
    @@ -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))
    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.
    */
    - writel((status & ~CDNS_UART_CR_TX_DIS) | CDNS_UART_CR_TX_EN,
    - port->membase + CDNS_UART_CR_OFFSET);
    + status = readl(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) &
    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.
    */
    ctrl = readl(port->membase + CDNS_UART_CR_OFFSET);
    - writel((ctrl & ~CDNS_UART_CR_TX_DIS) | CDNS_UART_CR_TX_EN,
    - port->membase + CDNS_UART_CR_OFFSET);
    + ctrl &= ~CDNS_UART_CR_TX_DIS;
    + ctrl |= CDNS_UART_CR_TX_EN;
    + writel(ctrl, port->membase + CDNS_UART_CR_OFFSET);

    uart_console_write(port, s, count, cdns_uart_console_putchar);
    cdns_uart_console_wait_tx(port);
    --
    2.6.3.3.g9bb996a


    \
     
     \ /
      Last update: 2015-11-19 21:41    [W:2.310 / U:0.280 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site