diff options
author | Nicolas Ferre <nicolas.ferre@atmel.com> | 2011-10-12 12:06:57 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-18 19:42:06 -0400 |
commit | 1acfc7eca664783ee20d951683ed229eaa64f573 (patch) | |
tree | e34bb4b2fc3da7d5781a8d8da630e617e4bf1295 /drivers/tty/serial/atmel_serial.c | |
parent | 0331bbf3c6fd9997e5f0d165840229ccfeba6548 (diff) |
tty/serial: atmel_serial: change platform_data variable name
Easier to follow if platform_data name is pdata.
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>
Diffstat (limited to 'drivers/tty/serial/atmel_serial.c')
-rw-r--r-- | drivers/tty/serial/atmel_serial.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c index c7232a916c1b..a507daa05cfb 100644 --- a/drivers/tty/serial/atmel_serial.c +++ b/drivers/tty/serial/atmel_serial.c | |||
@@ -1417,13 +1417,13 @@ static void __devinit atmel_init_port(struct atmel_uart_port *atmel_port, | |||
1417 | struct platform_device *pdev) | 1417 | struct platform_device *pdev) |
1418 | { | 1418 | { |
1419 | struct uart_port *port = &atmel_port->uart; | 1419 | struct uart_port *port = &atmel_port->uart; |
1420 | struct atmel_uart_data *data = pdev->dev.platform_data; | 1420 | struct atmel_uart_data *pdata = pdev->dev.platform_data; |
1421 | 1421 | ||
1422 | port->iotype = UPIO_MEM; | 1422 | port->iotype = UPIO_MEM; |
1423 | port->flags = UPF_BOOT_AUTOCONF; | 1423 | port->flags = UPF_BOOT_AUTOCONF; |
1424 | port->ops = &atmel_pops; | 1424 | port->ops = &atmel_pops; |
1425 | port->fifosize = 1; | 1425 | port->fifosize = 1; |
1426 | port->line = data->num; | 1426 | port->line = pdata->num; |
1427 | port->dev = &pdev->dev; | 1427 | port->dev = &pdev->dev; |
1428 | port->mapbase = pdev->resource[0].start; | 1428 | port->mapbase = pdev->resource[0].start; |
1429 | port->irq = pdev->resource[1].start; | 1429 | port->irq = pdev->resource[1].start; |
@@ -1433,9 +1433,9 @@ static void __devinit atmel_init_port(struct atmel_uart_port *atmel_port, | |||
1433 | 1433 | ||
1434 | memset(&atmel_port->rx_ring, 0, sizeof(atmel_port->rx_ring)); | 1434 | memset(&atmel_port->rx_ring, 0, sizeof(atmel_port->rx_ring)); |
1435 | 1435 | ||
1436 | if (data->regs) | 1436 | if (pdata->regs) |
1437 | /* Already mapped by setup code */ | 1437 | /* Already mapped by setup code */ |
1438 | port->membase = data->regs; | 1438 | port->membase = pdata->regs; |
1439 | else { | 1439 | else { |
1440 | port->flags |= UPF_IOREMAP; | 1440 | port->flags |= UPF_IOREMAP; |
1441 | port->membase = NULL; | 1441 | port->membase = NULL; |
@@ -1450,9 +1450,9 @@ static void __devinit atmel_init_port(struct atmel_uart_port *atmel_port, | |||
1450 | /* only enable clock when USART is in use */ | 1450 | /* only enable clock when USART is in use */ |
1451 | } | 1451 | } |
1452 | 1452 | ||
1453 | atmel_port->use_dma_rx = data->use_dma_rx; | 1453 | atmel_port->use_dma_rx = pdata->use_dma_rx; |
1454 | atmel_port->use_dma_tx = data->use_dma_tx; | 1454 | atmel_port->use_dma_tx = pdata->use_dma_tx; |
1455 | atmel_port->rs485 = data->rs485; | 1455 | atmel_port->rs485 = pdata->rs485; |
1456 | /* Use TXEMPTY for interrupt when rs485 else TXRDY or ENDTX|TXBUFE */ | 1456 | /* Use TXEMPTY for interrupt when rs485 else TXRDY or ENDTX|TXBUFE */ |
1457 | if (atmel_port->rs485.flags & SER_RS485_ENABLED) | 1457 | if (atmel_port->rs485.flags & SER_RS485_ENABLED) |
1458 | atmel_port->tx_done_mask = ATMEL_US_TXEMPTY; | 1458 | atmel_port->tx_done_mask = ATMEL_US_TXEMPTY; |