Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 588edbf3 authored by Nicolas Ferre's avatar Nicolas Ferre Committed by Greg Kroah-Hartman
Browse files

tty/serial: atmel_serial: whitespace and braces modifications 



Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 1acfc7ec

drivers/tty/serial/atmel_serial.c

+5 −4
Original line number Original line Diff line number Diff line
@@ -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));

	memset(&atmel_port->rx_ring, 0, sizeof(atmel_port->rx_ring));





	if (pdata->regs)

	if (pdata->regs) {

		/* Already mapped by setup code */

		/* Already mapped by setup code */

		port->membase = pdata->regs;

		port->membase = pdata->regs;

	else {

	} else {

		port->flags	|= UPF_IOREMAP;

		port->flags	|= UPF_IOREMAP;

		port->membase	= NULL;

		port->membase	= NULL;

	}

	}
@@ -1453,6 +1453,7 @@ static void __devinit atmel_init_port(struct atmel_uart_port *atmel_port, 
	atmel_port->use_dma_rx	= pdata->use_dma_rx;

	atmel_port->use_dma_rx	= pdata->use_dma_rx;

	atmel_port->use_dma_tx	= pdata->use_dma_tx;

	atmel_port->use_dma_tx	= pdata->use_dma_tx;

	atmel_port->rs485	= pdata->rs485;

	atmel_port->rs485	= pdata->rs485;



	/* Use TXEMPTY for interrupt when rs485 else TXRDY or ENDTX|TXBUFE */

	/* Use TXEMPTY for interrupt when rs485 else TXRDY or ENDTX|TXBUFE */

	if (atmel_port->rs485.flags & SER_RS485_ENABLED)

	if (atmel_port->rs485.flags & SER_RS485_ENABLED)

		atmel_port->tx_done_mask = ATMEL_US_TXEMPTY;

		atmel_port->tx_done_mask = ATMEL_US_TXEMPTY;