lkml.org 
[lkml]   [2022]   [Jul]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 190/201] tty: drop tty_schedule_flip()
    Date
    From: Jiri Slaby <jslaby@suse.cz>

    commit 5db96ef23bda6c2a61a51693c85b78b52d03f654 upstream.

    Since commit a9c3f68f3cd8d (tty: Fix low_latency BUG) in 2014,
    tty_flip_buffer_push() is only a wrapper to tty_schedule_flip(). All
    users were converted in the previous patches, so remove
    tty_schedule_flip() completely while inlining its body into
    tty_flip_buffer_push().

    One less exported function.

    Reviewed-by: Johan Hovold <johan@kernel.org>
    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    Link: https://lore.kernel.org/r/20211122111648.30379-4-jslaby@suse.cz
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/tty/tty_buffer.c | 30 ++++++++----------------------
    include/linux/tty_flip.h | 1 -
    2 files changed, 8 insertions(+), 23 deletions(-)

    --- a/drivers/tty/tty_buffer.c
    +++ b/drivers/tty/tty_buffer.c
    @@ -403,27 +403,6 @@ int __tty_insert_flip_char(struct tty_po
    EXPORT_SYMBOL(__tty_insert_flip_char);

    /**
    - * tty_schedule_flip - push characters to ldisc
    - * @port: tty port to push from
    - *
    - * Takes any pending buffers and transfers their ownership to the
    - * ldisc side of the queue. It then schedules those characters for
    - * processing by the line discipline.
    - */
    -
    -void tty_schedule_flip(struct tty_port *port)
    -{
    - struct tty_bufhead *buf = &port->buf;
    -
    - /* paired w/ acquire in flush_to_ldisc(); ensures
    - * flush_to_ldisc() sees buffer data.
    - */
    - smp_store_release(&buf->tail->commit, buf->tail->used);
    - queue_work(system_unbound_wq, &buf->work);
    -}
    -EXPORT_SYMBOL(tty_schedule_flip);
    -
    -/**
    * tty_prepare_flip_string - make room for characters
    * @port: tty port
    * @chars: return pointer for character write area
    @@ -567,7 +546,14 @@ static void flush_to_ldisc(struct work_s

    void tty_flip_buffer_push(struct tty_port *port)
    {
    - tty_schedule_flip(port);
    + struct tty_bufhead *buf = &port->buf;
    +
    + /*
    + * Paired w/ acquire in flush_to_ldisc(); ensures flush_to_ldisc() sees
    + * buffer data.
    + */
    + smp_store_release(&buf->tail->commit, buf->tail->used);
    + queue_work(system_unbound_wq, &buf->work);
    }
    EXPORT_SYMBOL(tty_flip_buffer_push);

    --- a/include/linux/tty_flip.h
    +++ b/include/linux/tty_flip.h
    @@ -17,7 +17,6 @@ extern int tty_insert_flip_string_fixed_
    extern int tty_prepare_flip_string(struct tty_port *port,
    unsigned char **chars, size_t size);
    extern void tty_flip_buffer_push(struct tty_port *port);
    -void tty_schedule_flip(struct tty_port *port);
    int __tty_insert_flip_char(struct tty_port *port, unsigned char ch, char flag);

    static inline int tty_insert_flip_char(struct tty_port *port,

    \
     
     \ /
      Last update: 2022-07-27 19:24    [W:4.629 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site