lkml.org 
[lkml]   [2013]   [Jun]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 14/16] tty: Merge __tty_flush_buffer() into lone call site
    Date
    __tty_flush_buffer() is now only called by tty_flush_buffer();
    merge functions.

    Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
    ---
    drivers/tty/tty_buffer.c | 29 ++++++-----------------------
    1 file changed, 6 insertions(+), 23 deletions(-)

    diff --git a/drivers/tty/tty_buffer.c b/drivers/tty/tty_buffer.c
    index fb042b9..dbe4a71 100644
    --- a/drivers/tty/tty_buffer.c
    +++ b/drivers/tty/tty_buffer.c
    @@ -151,28 +151,6 @@ static void tty_buffer_free(struct tty_port *port, struct tty_buffer *b)
    }

    /**
    - * __tty_buffer_flush - flush full tty buffers
    - * @tty: tty to flush
    - *
    - * flush all the buffers containing receive data. Caller must
    - * hold the buffer lock and must have ensured no parallel flush to
    - * ldisc is running.
    - */
    -
    -static void __tty_buffer_flush(struct tty_port *port)
    -{
    - struct tty_bufhead *buf = &port->buf;
    - struct tty_buffer *next;
    -
    - while ((next = buf->head->next) != NULL) {
    - tty_buffer_free(port, buf->head);
    - buf->head = next;
    - }
    - WARN_ON(buf->head != buf->tail);
    - buf->head->read = buf->head->commit;
    -}
    -
    -/**
    * tty_buffer_flush - flush full tty buffers
    * @tty: tty to flush
    *
    @@ -188,11 +166,16 @@ void tty_buffer_flush(struct tty_struct *tty)
    {
    struct tty_port *port = tty->port;
    struct tty_bufhead *buf = &port->buf;
    + struct tty_buffer *next;

    buf->flushpending = 1;

    mutex_lock(&buf->flush_mutex);
    - __tty_buffer_flush(port);
    + while ((next = buf->head->next) != NULL) {
    + tty_buffer_free(port, buf->head);
    + buf->head = next;
    + }
    + buf->head->read = buf->head->commit;
    buf->flushpending = 0;
    mutex_unlock(&buf->flush_mutex);
    }
    --
    1.8.1.2


    \
     
     \ /
      Last update: 2013-06-15 16:21    [W:4.023 / U:0.780 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site