acorn/fd1772: replace sleep_on() with wait_event()

PATCH New [email protected] 1 participant 1 message Mar 5, 2005

Share & tools

[email protected]

author

2005-03-05 22:49 UTC #0 lore raw

PATCH 2/4 acorn/fd1772: replace sleep_on() with wait_event()

Use wait_event() instead of the deprecated sleep_on(). Since wait_event() expects the condition upon which the loop should return, pass in the negation of the current conditional.

Signed-off-by Nishanth Aravamudan <[email protected]>

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

---

 kj-domen/drivers/acorn/block/fd1772.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

drivers/acorn/block/fd1772.c renamed from drivers/acorn/block/fd1772.c~wait_event-drivers_acorn_block_fd1772 +2 -2

diff -puN drivers/acorn/block/fd1772.c~wait_event-drivers_acorn_block_fd1772 drivers/acorn/block/fd1772.c
@@ -139,6 +139,7 @@
 #include <linux/delay.h>
 #include <linux/mm.h>
 #include <linux/bitops.h>
+#include <linux/wait.h>
 
 #include <asm/arch/oldlatches.h>
 #include <asm/dma.h>

@@ -1283,8 +1284,7 @@ static void do_fd_request(request_queue_
 	if (fdc_busy) return;
 	save_flags(flags);
 	cli();
-	while (fdc_busy)
-		sleep_on(&fdc_wait);
+	wait_event(fdc_wait, !fdc_busy);
 	fdc_busy = 1;
 	ENABLE_IRQ();
 	restore_flags(flags);