From 8cf5a8c5729116d0d60815393ec9f1c0f0bc2df7 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Thu, 18 Oct 2007 03:06:25 -0700 Subject: 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 Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- drivers/char/rocket_int.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'drivers/char/rocket_int.h') 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; }; -- cgit v1.2.3