11/34: cdrom/aztcd: remove sleep_on() usage

PATCH In review [email protected] 1 participant 1 message Mar 6, 2005

Share & tools

[email protected]

author

2005-03-06 10:34 UTC #0 lore raw

PATCH 3/6 11/34: cdrom/aztcd: remove sleep_on() usage

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 <[email protected]>

Signed-off-by Domen Puncer <[email protected]>

---

 kj-domen/drivers/cdrom/aztcd.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletion(-)

drivers/cdrom/aztcd.c renamed from drivers/cdrom/aztcd.c~sleep_on-drivers_cdrom_aztcd +5 -1

diff -puN drivers/cdrom/aztcd.c~sleep_on-drivers_cdrom_aztcd drivers/cdrom/aztcd.c
@@ -179,6 +179,7 @@
 #include <linux/ioport.h>
 #include <linux/string.h>
 #include <linux/major.h>
+#include <linux/wait.h>
 
 #include <linux/init.h>

@@ -429,9 +430,12 @@ static void dten_low(void)
 #define STEN_LOW_WAIT   statusAzt()
 static void statusAzt(void)
 {
+	DEFINE_WAIT(wait);
 	AztTimeout = AZT_STATUS_DELAY;
 	SET_TIMER(aztStatTimer, HZ / 100);
-	sleep_on(&azt_waitq);
+	prepare_to_wait(&azt_waitq, &wait, TASK_UNINTERRUPTIBLE);
+	schedule();
+	finish_wait(&azt_waitq, &wait);
 	if (AztTimeout <= 0)
 		printk("aztcd: Error Wait STEN_LOW_WAIT command:%x\n",
 		       aztCmd);