diff options
| author |   Nishanth Aravamudan <nacc@us.ibm.com> | 2005-09-10 00:27:30 -0700 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-10 10:06:38 -0700 |
| commit | da4cd8dfe18ee901b880f94ca0fa79d5cc1cd0eb (patch) | |
| tree | 7f135b3c3d9450e3b489cd39af6085e338013613 /drivers/char/ip2 | |
| parent | [PATCH] drivers/cdrom: fix-up schedule_timeout() usage (diff) | |
| download | linux-dev-da4cd8dfe18ee901b880f94ca0fa79d5cc1cd0eb.tar.xz linux-dev-da4cd8dfe18ee901b880f94ca0fa79d5cc1cd0eb.zip | |
[PATCH] drivers/char: fix-up schedule_timeout() usage
Use schedule_timeout_interruptible() instead of
set_current_state()/schedule_timeout() to reduce kernel size.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/char/ip2')
| -rw-r--r-- | drivers/char/ip2/i2lib.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/char/ip2/i2lib.c b/drivers/char/ip2/i2lib.c index 82c5f30375ac..ba85eb1b6ec7 100644 --- a/drivers/char/ip2/i2lib.c +++ b/drivers/char/ip2/i2lib.c @@ -655,8 +655,7 @@ i2QueueCommands(int type, i2ChanStrPtr pCh, int timeout, int nCommands, timeout--; // So negative values == forever if (!in_interrupt()) { - current->state = TASK_INTERRUPTIBLE; - schedule_timeout(1); // short nap + schedule_timeout_interruptible(1); // short nap } else { // we cannot sched/sleep in interrrupt silly return 0; @@ -1132,8 +1131,7 @@ i2Output(i2ChanStrPtr pCh, const char *pSource, int count, int user ) ip2trace (CHANN, ITRC_OUTPUT, 61, 0 ); - current->state = TASK_INTERRUPTIBLE; - schedule_timeout(2); + schedule_timeout_interruptible(2); if (signal_pending(current)) { break; } |