Char: tty, remove sleep_on
PATCH 1/2 Char: tty, remove sleep_on
Use wait_event instead of sleep_on in tty_block_til_ready.
Wait for ASYNC_CLOSING flag being 0.
Signed-off-by Jiri Slaby <[email protected]>
--- drivers/char/tty_port.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
drivers/char/tty_port.c +2 -1
@@ -198,7 +198,8 @@ int tty_port_block_til_ready(struct tty_port *port,/* block if port is in the process of being closed */ if (tty_hung_up_p (filp) || port->flags &ASYNC_CLOSING ) { -interruptible_sleep_on (&port->close_wait); +wait_event_interruptible (port->close_wait, + !(port->flags &ASYNC_CLOSING ));if (port->flags &ASYNC_HUP_NOTIFY )return -EAGAIN ;else
Signature · 1 line
1.6.3.2
PATCH 2/2 Char: tty, use prepare/finish_wait
Use prepare_to_wait and finish_wait instead of add_wait_queue and remove_wait_queue.
This avoids us setting a task state.
Signed-off-by Jiri Slaby <[email protected]>
--- drivers/char/tty_port.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-)
drivers/char/tty_port.c +2 -4
@@ -222,7 +222,6 @@ int tty_port_block_til_ready(struct tty_port *port,before the next open may complete */ retval =0 ; -add_wait_queue (&port->open_wait, &wait);/* The port lock protects the port counts */ spin_lock_irqsave (&port->lock, flags);
@@ -236,7 +235,7 @@ int tty_port_block_til_ready(struct tty_port *port,if (tty->termios->c_cflag &CBAUD )tty_port_raise_dtr_rts (port); -set_current_state (TASK_INTERRUPTIBLE ); +prepare_to_wait (&port->open_wait, &wait,TASK_INTERRUPTIBLE );/* Check for a hangup or uninitialised port. Return accordingly */ if (tty_hung_up_p (filp) || !(port->flags &ASYNC_INITIALIZED )) {if (port->flags &ASYNC_HUP_NOTIFY )
@@ -257,8 +256,7 @@ int tty_port_block_til_ready(struct tty_port *port, }schedule (); } -set_current_state (TASK_RUNNING ); -remove_wait_queue (&port->open_wait, &wait); +finish_wait (&port->open_wait, &wait);/* Update counts. A parallel hangup will have set count to zero and we must not mess that up further */
Signature · 1 line
1.6.3.2
Quoted 3 lines · On Wed, 10 Jun 2009 14:08:03 +0200 Jiri Slaby <[email protected]> wrote:
Use
wait_eventinstead ofsleep_onintty_block_til_ready.Wait for
ASYNC_CLOSINGflag being 0.
Both applied