lkml.org 
[lkml]   [2013]   [Mar]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5 07/44] tty: Relocate tty_ldisc_halt() to avoid forward declaration
    Date
    tty_ldisc_halt() will use the file-scoped function, tty_ldisc_wait_idle(),
    in the following patch.

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

    diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
    index 15667c0..f691c76 100644
    --- a/drivers/tty/tty_ldisc.c
    +++ b/drivers/tty/tty_ldisc.c
    @@ -499,29 +499,6 @@ static void tty_ldisc_restore(struct tty_struct *tty, struct tty_ldisc *old)
    }

    /**
    - * tty_ldisc_halt - shut down the line discipline
    - * @tty: tty device
    - *
    - * Shut down the line discipline and work queue for this tty device.
    - * The TTY_LDISC flag being cleared ensures no further references can
    - * be obtained while the delayed work queue halt ensures that no more
    - * data is fed to the ldisc.
    - *
    - * You need to do a 'flush_scheduled_work()' (outside the ldisc_mutex)
    - * in order to make sure any currently executing ldisc work is also
    - * flushed.
    - */
    -
    -static int tty_ldisc_halt(struct tty_struct *tty)
    -{
    - int scheduled;
    - clear_bit(TTY_LDISC, &tty->flags);
    - scheduled = cancel_work_sync(&tty->port->buf.work);
    - set_bit(TTY_LDISC_HALTED, &tty->flags);
    - return scheduled;
    -}
    -
    -/**
    * tty_ldisc_flush_works - flush all works of a tty
    * @tty: tty device to flush works for
    *
    @@ -551,6 +528,29 @@ static int tty_ldisc_wait_idle(struct tty_struct *tty, long timeout)
    }

    /**
    + * tty_ldisc_halt - shut down the line discipline
    + * @tty: tty device
    + *
    + * Shut down the line discipline and work queue for this tty device.
    + * The TTY_LDISC flag being cleared ensures no further references can
    + * be obtained while the delayed work queue halt ensures that no more
    + * data is fed to the ldisc.
    + *
    + * You need to do a 'flush_scheduled_work()' (outside the ldisc_mutex)
    + * in order to make sure any currently executing ldisc work is also
    + * flushed.
    + */
    +
    +static int tty_ldisc_halt(struct tty_struct *tty)
    +{
    + int scheduled;
    + clear_bit(TTY_LDISC, &tty->flags);
    + scheduled = cancel_work_sync(&tty->port->buf.work);
    + set_bit(TTY_LDISC_HALTED, &tty->flags);
    + return scheduled;
    +}
    +
    +/**
    * tty_ldisc_hangup_halt - halt the line discipline for hangup
    * @tty: tty being hung up
    *
    --
    1.8.1.2


    \
     
     \ /
      Last update: 2013-03-13 02:41    [W:3.755 / U:0.160 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site