Messages in this thread Patch in this message | | | Date | Mon, 20 Jun 2005 23:51:49 +0200 | From | domen@coderock ... | Subject | [patch 3/4] cdrom/sjcd: remove sleep_on() usage |
| |
From: Nishanth Aravamudan <nacc@us.ibm.com>
Directly use wait-queues instead of the deprecated sleep_on(). This required adding a local waitqueue. Patch is compile-tested.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com> Signed-off-by: Domen Puncer <domen@coderock.org> --- sjcd.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletion(-)
Index: quilt/drivers/cdrom/sjcd.c =================================================================== --- quilt.orig/drivers/cdrom/sjcd.c +++ quilt/drivers/cdrom/sjcd.c @@ -70,6 +70,7 @@ #include <linux/string.h> #include <linux/major.h> #include <linux/init.h> +#include <linux/wait.h> #include <asm/system.h> #include <asm/io.h> @@ -407,9 +408,12 @@ static void sjcd_status_timer(void) */ static int sjcd_wait_for_status(void) { + DEFINE_WAIT(wait); sjcd_status_timeout = SJCD_WAIT_FOR_STATUS_TIMEOUT; SJCD_SET_TIMER(sjcd_status_timer, 1); - sleep_on(&sjcd_waitq); + prepare_to_wait(&sjcd_waitq, &wait, TASK_UNINTERRUPTIBLE); + schedule(); + finish_wait(&sjcd_waitq, &wait); #if defined( SJCD_DIAGNOSTIC ) || defined ( SJCD_TRACE ) if (sjcd_status_timeout <= 0) printk("SJCD: Error Wait For Status.\n"); -- - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |