[PATCH] ARM: switch fd1772.c from sleep_on to wait_event

Doesn't make the local irq disabling around it less buggy, but at
least we replace the offender with the right kind of primitive.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/drivers/acorn/block/fd1772.c b/drivers/acorn/block/fd1772.c
index 3cd2e968e96c31dd24477343470834091f29ee5d..c0a37d98b4f3d3c3c485de77ac2391295089852b 100644 (file)
--- a/drivers/acorn/block/fd1772.c
+++ b/drivers/acorn/block/fd1772.c
@@ -1283,8 +1283,7 @@ static void do_fd_request(request_queue_t* q)
        if (fdc_busy) return;
        save_flags(flags);
        cli();
        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);
        fdc_busy = 1;
        ENABLE_IRQ();
        restore_flags(flags);