Re: [PATCH v2 3/5] tty/serial: atmel_serial: whitespace and braces modifications
From: Grant Likely <hidden>
Date: 2011-10-13 02:25:33
Also in:
linux-arm-kernel, linux-serial, lkml
On Wed, Oct 12, 2011 at 06:06:58PM +0200, Nicolas Ferre wrote:
Signed-off-by: Nicolas Ferre <redacted>
Acked-by: Grant Likely <redacted>
quoted hunk ↗ jump to hunk
--- drivers/tty/serial/atmel_serial.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-)diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c index a507daa..bb72354 100644 --- a/drivers/tty/serial/atmel_serial.c +++ b/drivers/tty/serial/atmel_serial.c@@ -1433,10 +1433,10 @@ static void __devinit atmel_init_port(struct atmel_uart_port *atmel_port, memset(&atmel_port->rx_ring, 0, sizeof(atmel_port->rx_ring)); - if (pdata->regs) + if (pdata->regs) { /* Already mapped by setup code */ port->membase = pdata->regs; - else { + } else { port->flags |= UPF_IOREMAP; port->membase = NULL; }@@ -1450,9 +1450,10 @@ static void __devinit atmel_init_port(struct atmel_uart_port *atmel_port, /* only enable clock when USART is in use */ } - atmel_port->use_dma_rx = pdata->use_dma_rx; - atmel_port->use_dma_tx = pdata->use_dma_tx; + atmel_port->use_dma_rx = pdata->use_dma_rx; + atmel_port->use_dma_tx = pdata->use_dma_tx; atmel_port->rs485 = pdata->rs485; + /* Use TXEMPTY for interrupt when rs485 else TXRDY or ENDTX|TXBUFE */ if (atmel_port->rs485.flags & SER_RS485_ENABLED) atmel_port->tx_done_mask = ATMEL_US_TXEMPTY;-- 1.7.5.4