Skip to content

Commit

Permalink
tty/serial: atmel_serial: whitespace and braces modifications
Browse files Browse the repository at this point in the history
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Nicolas Ferre authored and Greg Kroah-Hartman committed Oct 18, 2011
1 parent 1acfc7e commit 588edbf
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions drivers/tty/serial/atmel_serial.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -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;
Expand Down

0 comments on commit 588edbf

Please sign in to comment.