[patch 2/4] acorn/fd1772: replace sleep_on() with wait_event()

[patch 2/4] acorn/fd1772: replace sleep_on() with wait_event()

[domen]

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 <nacc@us.ibm.com>
Signed-off-by: Domen Puncer <domen@coderock.org>
---


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

diff -puN drivers/acorn/block/fd1772.c~wait_event-drivers_acorn_block_fd1772 drivers/acorn/block/fd1772.c
--- kj/drivers/acorn/block/fd1772.c~wait_event-drivers_acorn_block_fd1772	2005-03-05 16:11:23.000000000 +0100
+++ kj-domen/drivers/acorn/block/fd1772.c	2005-03-05 16:11:23.000000000 +0100
@@ -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);
_