lkml.org 
[lkml]   [2009]   [Jun]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/9 -v2] imx: serial: fix whitespaces (no changes in functionality)
    Date
    Signed-off-by: Oskar Schirmer <os@emlix.com>
    ---
    drivers/serial/imx.c | 48 +++++++++++++++++++++++-------------------------
    1 files changed, 23 insertions(+), 25 deletions(-)

    diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c
    index 9f460b1..424f679 100644
    --- a/drivers/serial/imx.c
    +++ b/drivers/serial/imx.c
    @@ -302,8 +302,7 @@ static inline void imx_transmit_buffer(struct imx_port *sport)
    /* send xmit->buf[xmit->tail]
    * out the port here */
    writel(xmit->buf[xmit->tail], sport->port.membase + URTX0);
    - xmit->tail = (xmit->tail + 1) &
    - (UART_XMIT_SIZE - 1);
    + xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
    sport->port.icount.tx++;
    if (uart_circ_empty(xmit))
    break;
    @@ -395,8 +394,7 @@ static irqreturn_t imx_rxint(int irq, void *dev_id)
    continue;
    }

    - if (uart_handle_sysrq_char
    - (&sport->port, (unsigned char)rx))
    + if (uart_handle_sysrq_char(&sport->port, (unsigned char)rx))
    continue;

    if (rx & (URXD_PRERR | URXD_OVRRUN | URXD_FRMERR) ) {
    @@ -471,26 +469,26 @@ static unsigned int imx_tx_empty(struct uart_port *port)
    */
    static unsigned int imx_get_mctrl(struct uart_port *port)
    {
    - struct imx_port *sport = (struct imx_port *)port;
    - unsigned int tmp = TIOCM_DSR | TIOCM_CAR;
    + struct imx_port *sport = (struct imx_port *)port;
    + unsigned int tmp = TIOCM_DSR | TIOCM_CAR;

    - if (readl(sport->port.membase + USR1) & USR1_RTSS)
    - tmp |= TIOCM_CTS;
    + if (readl(sport->port.membase + USR1) & USR1_RTSS)
    + tmp |= TIOCM_CTS;

    - if (readl(sport->port.membase + UCR2) & UCR2_CTS)
    - tmp |= TIOCM_RTS;
    + if (readl(sport->port.membase + UCR2) & UCR2_CTS)
    + tmp |= TIOCM_RTS;

    - return tmp;
    + return tmp;
    }

    static void imx_set_mctrl(struct uart_port *port, unsigned int mctrl)
    {
    - struct imx_port *sport = (struct imx_port *)port;
    + struct imx_port *sport = (struct imx_port *)port;
    unsigned long temp;

    temp = readl(sport->port.membase + UCR2) & ~UCR2_CTS;

    - if (mctrl & TIOCM_RTS)
    + if (mctrl & TIOCM_RTS)
    temp |= UCR2_CTS;

    writel(temp, sport->port.membase + UCR2);
    @@ -1070,22 +1068,22 @@ static struct uart_driver imx_reg = {

    static int serial_imx_suspend(struct platform_device *dev, pm_message_t state)
    {
    - struct imx_port *sport = platform_get_drvdata(dev);
    + struct imx_port *sport = platform_get_drvdata(dev);

    - if (sport)
    - uart_suspend_port(&imx_reg, &sport->port);
    + if (sport)
    + uart_suspend_port(&imx_reg, &sport->port);

    - return 0;
    + return 0;
    }

    static int serial_imx_resume(struct platform_device *dev)
    {
    - struct imx_port *sport = platform_get_drvdata(dev);
    + struct imx_port *sport = platform_get_drvdata(dev);

    - if (sport)
    - uart_resume_port(&imx_reg, &sport->port);
    + if (sport)
    + uart_resume_port(&imx_reg, &sport->port);

    - return 0;
    + return 0;
    }

    static int serial_imx_probe(struct platform_device *pdev)
    @@ -1141,7 +1139,7 @@ static int serial_imx_probe(struct platform_device *pdev)
    imx_ports[pdev->id] = sport;

    pdata = pdev->dev.platform_data;
    - if(pdata && (pdata->flags & IMXUART_HAVE_RTSCTS))
    + if (pdata && (pdata->flags & IMXUART_HAVE_RTSCTS))
    sport->have_rtscts = 1;

    if (pdata->init) {
    @@ -1191,13 +1189,13 @@ static int serial_imx_remove(struct platform_device *pdev)
    }

    static struct platform_driver serial_imx_driver = {
    - .probe = serial_imx_probe,
    - .remove = serial_imx_remove,
    + .probe = serial_imx_probe,
    + .remove = serial_imx_remove,

    .suspend = serial_imx_suspend,
    .resume = serial_imx_resume,
    .driver = {
    - .name = "imx-uart",
    + .name = "imx-uart",
    .owner = THIS_MODULE,
    },
    };
    --
    1.5.3.7


    \
     
     \ /
      Last update: 2009-06-10 14:13    [W:0.034 / U:30.948 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site