diff options
| author | Jiri Slaby <jirislaby@gmail.com> | 2007-10-18 03:06:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-18 14:37:27 -0700 |
| commit | 8cf5a8c5729116d0d60815393ec9f1c0f0bc2df7 (patch) | |
| tree | d5a8c13703b02c8d6f05a3cb3e7273991071244f /drivers/char/rocket_int.h | |
| parent | 95e0791480af8347460d0cbe34a46eca7e77d0d0 (diff) | |
| download | linux-8cf5a8c5729116d0d60815393ec9f1c0f0bc2df7.tar.gz | |
Char: rocket, switch sleep_on to completion
rocket, switch sleep_on to completion - sleep_on is deprecated and racy, use completion instead - also check retval of interruptible function and return ERESTARTSYS eventually Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/char/rocket_int.h')
| -rw-r--r-- | drivers/char/rocket_int.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/char/rocket_int.h b/drivers/char/rocket_int.h index b4c53dfa7951..55b8f2d71a96 100644 --- a/drivers/char/rocket_int.h +++ b/drivers/char/rocket_int.h @@ -1163,13 +1163,8 @@ struct r_port { int read_status_mask; int cps; -#ifdef DECLARE_WAITQUEUE wait_queue_head_t open_wait; - wait_queue_head_t close_wait; -#else - struct wait_queue *open_wait; - struct wait_queue *close_wait; -#endif + struct completion close_wait; spinlock_t slock; struct mutex write_mtx; }; |