diff options
author | Nishanth Aravamudan <nacc@us.ibm.com> | 2005-09-12 17:15:34 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2005-09-12 17:15:34 -0400 |
commit | 121caf577dc61588c1128821873a08cec48baf58 (patch) | |
tree | 751e2e6bf9b58aa4b40e8285d357b0cf083ae8cc /net/irda | |
parent | 7672d0b54411371e0b6a831c1cb2f0ce615de6dc (diff) |
[NET]: fix-up schedule_timeout() usage
Use schedule_timeout_{,un}interruptible() instead of
set_current_state()/schedule_timeout() to reduce kernel size. Also use
human-time conversion functions instead of hard-coded division to avoid
rounding issues.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/irda')
-rw-r--r-- | net/irda/ircomm/ircomm_tty.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c index 5d1e61168eb7..6f20b4206e08 100644 --- a/net/irda/ircomm/ircomm_tty.c +++ b/net/irda/ircomm/ircomm_tty.c | |||
@@ -567,10 +567,8 @@ static void ircomm_tty_close(struct tty_struct *tty, struct file *filp) | |||
567 | self->tty = NULL; | 567 | self->tty = NULL; |
568 | 568 | ||
569 | if (self->blocked_open) { | 569 | if (self->blocked_open) { |
570 | if (self->close_delay) { | 570 | if (self->close_delay) |
571 | current->state = TASK_INTERRUPTIBLE; | 571 | schedule_timeout_interruptible(self->close_delay); |
572 | schedule_timeout(self->close_delay); | ||
573 | } | ||
574 | wake_up_interruptible(&self->open_wait); | 572 | wake_up_interruptible(&self->open_wait); |
575 | } | 573 | } |
576 | 574 | ||
@@ -863,8 +861,7 @@ static void ircomm_tty_wait_until_sent(struct tty_struct *tty, int timeout) | |||
863 | spin_lock_irqsave(&self->spinlock, flags); | 861 | spin_lock_irqsave(&self->spinlock, flags); |
864 | while (self->tx_skb && self->tx_skb->len) { | 862 | while (self->tx_skb && self->tx_skb->len) { |
865 | spin_unlock_irqrestore(&self->spinlock, flags); | 863 | spin_unlock_irqrestore(&self->spinlock, flags); |
866 | current->state = TASK_INTERRUPTIBLE; | 864 | schedule_timeout_interruptible(poll_time); |
867 | schedule_timeout(poll_time); | ||
868 | spin_lock_irqsave(&self->spinlock, flags); | 865 | spin_lock_irqsave(&self->spinlock, flags); |
869 | if (signal_pending(current)) | 866 | if (signal_pending(current)) |
870 | break; | 867 | break; |