lkml.org 
[lkml]   [2011]   [Oct]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 2/5] tty/serial: atmel_serial: change platform_data variable name
    Date
    Easier to follow if platform_data name is pdata.

    Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
    ---
    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 c7232a9..a507daa 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,
    struct platform_device *pdev)
    {
    struct uart_port *port = &atmel_port->uart;
    - struct atmel_uart_data *data = pdev->dev.platform_data;
    + struct atmel_uart_data *pdata = pdev->dev.platform_data;

    port->iotype = UPIO_MEM;
    port->flags = UPF_BOOT_AUTOCONF;
    port->ops = &atmel_pops;
    port->fifosize = 1;
    - port->line = data->num;
    + port->line = pdata->num;
    port->dev = &pdev->dev;
    port->mapbase = pdev->resource[0].start;
    port->irq = pdev->resource[1].start;
    @@ -1433,9 +1433,9 @@ static void __devinit atmel_init_port(struct atmel_uart_port *atmel_port,

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

    - if (data->regs)
    + if (pdata->regs)
    /* Already mapped by setup code */
    - port->membase = data->regs;
    + port->membase = pdata->regs;
    else {
    port->flags |= UPF_IOREMAP;
    port->membase = NULL;
    @@ -1450,9 +1450,9 @@ 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 = data->use_dma_rx;
    - atmel_port->use_dma_tx = data->use_dma_tx;
    - atmel_port->rs485 = data->rs485;
    + 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


    \
     
     \ /
      Last update: 2011-10-12 18:11    [W:5.333 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site