lkml.org 
[lkml]   [2012]   [Aug]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RFC/PATCH 10/13] serial: omap: stick to put_autosuspend
    Date
    Everytime we're done using our TTY, we want
    the pm timer to be reinitilized. By sticking
    to pm_runtime_pm_autosuspend() we make sure
    that this will always be the case.

    Signed-off-by: Felipe Balbi <balbi@ti.com>
    ---
    drivers/tty/serial/omap-serial.c | 33 ++++++++++++++++++++++-----------
    1 file changed, 22 insertions(+), 11 deletions(-)

    diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
    index 6ea24c5..458d77c 100644
    --- a/drivers/tty/serial/omap-serial.c
    +++ b/drivers/tty/serial/omap-serial.c
    @@ -164,7 +164,8 @@ static void serial_omap_enable_ms(struct uart_port *port)
    pm_runtime_get_sync(up->dev);
    up->ier |= UART_IER_MSI;
    serial_out(up, UART_IER, up->ier);
    - pm_runtime_put(up->dev);
    + pm_runtime_mark_last_busy(up->dev);
    + pm_runtime_put_autosuspend(up->dev);
    }

    static void serial_omap_stop_tx(struct uart_port *port)
    @@ -412,7 +413,8 @@ static unsigned int serial_omap_tx_empty(struct uart_port *port)
    spin_lock_irqsave(&up->port.lock, flags);
    ret = serial_in(up, UART_LSR) & UART_LSR_TEMT ? TIOCSER_TEMT : 0;
    spin_unlock_irqrestore(&up->port.lock, flags);
    - pm_runtime_put(up->dev);
    + pm_runtime_mark_last_busy(up->dev);
    + pm_runtime_put_autosuspend(up->dev);
    return ret;
    }

    @@ -424,7 +426,8 @@ static unsigned int serial_omap_get_mctrl(struct uart_port *port)

    pm_runtime_get_sync(up->dev);
    status = check_modem_status(up);
    - pm_runtime_put(up->dev);
    + pm_runtime_mark_last_busy(up->dev);
    + pm_runtime_put_autosuspend(up->dev);

    dev_dbg(up->port.dev, "serial_omap_get_mctrl+%d\n", up->port.line);

    @@ -460,7 +463,8 @@ static void serial_omap_set_mctrl(struct uart_port *port, unsigned int mctrl)
    up->mcr = serial_in(up, UART_MCR);
    up->mcr |= mcr;
    serial_out(up, UART_MCR, up->mcr);
    - pm_runtime_put(up->dev);
    + pm_runtime_mark_last_busy(up->dev);
    + pm_runtime_put_autosuspend(up->dev);
    }

    static void serial_omap_break_ctl(struct uart_port *port, int break_state)
    @@ -477,7 +481,8 @@ static void serial_omap_break_ctl(struct uart_port *port, int break_state)
    up->lcr &= ~UART_LCR_SBC;
    serial_out(up, UART_LCR, up->lcr);
    spin_unlock_irqrestore(&up->port.lock, flags);
    - pm_runtime_put(up->dev);
    + pm_runtime_mark_last_busy(up->dev);
    + pm_runtime_put_autosuspend(up->dev);
    }

    static int serial_omap_startup(struct uart_port *port)
    @@ -575,7 +580,8 @@ static void serial_omap_shutdown(struct uart_port *port)
    if (serial_in(up, UART_LSR) & UART_LSR_DR)
    (void) serial_in(up, UART_RX);

    - pm_runtime_put(up->dev);
    + pm_runtime_mark_last_busy(up->dev);
    + pm_runtime_put_autosuspend(up->dev);
    free_irq(up->port.irq, up);
    }

    @@ -846,7 +852,8 @@ serial_omap_set_termios(struct uart_port *port, struct ktermios *termios,
    serial_omap_configure_xonxoff(up, termios);

    spin_unlock_irqrestore(&up->port.lock, flags);
    - pm_runtime_put(up->dev);
    + pm_runtime_mark_last_busy(up->dev);
    + pm_runtime_put_autosuspend(up->dev);
    dev_dbg(up->port.dev, "serial_omap_set_termios+%d\n", up->port.line);
    }

    @@ -877,7 +884,8 @@ serial_omap_pm(struct uart_port *port, unsigned int state,
    pm_runtime_allow(up->dev);
    }

    - pm_runtime_put(up->dev);
    + pm_runtime_mark_last_busy(up->dev);
    + pm_runtime_put_autosuspend(up->dev);
    }

    static void serial_omap_release_port(struct uart_port *port)
    @@ -959,7 +967,8 @@ static void serial_omap_poll_put_char(struct uart_port *port, unsigned char ch)
    pm_runtime_get_sync(up->dev);
    wait_for_xmitr(up);
    serial_out(up, UART_TX, ch);
    - pm_runtime_put(up->dev);
    + pm_runtime_mark_last_busy(up->dev);
    + pm_runtime_put_autosuspend(up->dev);
    }

    static int serial_omap_poll_get_char(struct uart_port *port)
    @@ -973,7 +982,8 @@ static int serial_omap_poll_get_char(struct uart_port *port)
    return NO_POLL_CHAR;

    status = serial_in(up, UART_RX);
    - pm_runtime_put(up->dev);
    + pm_runtime_mark_last_busy(up->dev);
    + pm_runtime_put_autosuspend(up->dev);
    return status;
    }

    @@ -1305,7 +1315,8 @@ static int serial_omap_probe(struct platform_device *pdev)
    if (ret != 0)
    goto err_add_port;

    - pm_runtime_put(&pdev->dev);
    + pm_runtime_mark_last_busy(up->dev);
    + pm_runtime_put_autosuspend(up->dev);
    platform_set_drvdata(pdev, up);
    return 0;

    --
    1.7.12.rc3


    \
     
     \ /
      Last update: 2012-08-21 12:01    [W:0.038 / U:32.960 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site