From 2ff1c253cdbfd553e53fca698ea48f0fedd1ed13 Mon Sep 17 00:00:00 2001 From: jhb Date: Fri, 10 Aug 2001 06:37:05 +0000 Subject: - Remove asleep(), await(), and M_ASLEEP. - Callers of asleep() and await() have been converted to calling tsleep(). The only caller outside of M_ASLEEP was the ata driver, which called both asleep() and await() with spl-raised, so there was no need for the asleep() and await() pair. M_ASLEEP was unused. Reviewed by: jasone, peter --- sys/dev/ata/ata-all.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'sys/dev/ata/ata-all.c') diff --git a/sys/dev/ata/ata-all.c b/sys/dev/ata/ata-all.c index 89e9901..01ebc46 100644 --- a/sys/dev/ata/ata-all.c +++ b/sys/dev/ata/ata-all.c @@ -970,14 +970,13 @@ out: switch (flags) { case ATA_WAIT_INTR: scp->active |= ATA_WAIT_INTR; - asleep((caddr_t)scp, PRIBIO, "atacmd", 10 * hz); ATA_OUTB(scp->r_io, ATA_CMD, command); /* enable interrupt */ if (scp->flags & ATA_QUEUED) ATA_OUTB(scp->r_altio, ATA_ALTSTAT, ATA_A_4BIT); - if (await(PRIBIO, 10 * hz)) { + if (tsleep((caddr_t)scp, PRIBIO, "atacmd", 10 * hz) != 0) { ata_printf(scp, device, "ata_command: timeout waiting for intr\n"); scp->active &= ~ATA_WAIT_INTR; error = -1; -- cgit v1.1