- 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

1 files changed, 1 insertions, 5 deletions

diff --git a/sys/dev/ata/atapi-all.c b/sys/dev/ata/atapi-all.c
index ac15c7e..b7d902b 100644
--- a/sys/dev/ata/atapi-all.c
+++ b/sys/dev/ata/atapi-all.c
@@ -199,10 +199,6 @@ atapi_queue_cmd(struct atapi_softc *atp, int8_t *ccb, caddr_t data,
 
     s = splbio();
 
-    /* if not using callbacks, prepare to sleep for this request */
-    if (!callback)
-	asleep((caddr_t)request, PRIBIO, "atprq", 0);
-
     /* append onto controller queue and try to start controller */
 #ifdef ATAPI_DEBUG
     ata_printf(atp->controller, atp->unit, "queueing %s ", 
@@ -222,7 +218,7 @@ atapi_queue_cmd(struct atapi_softc *atp, int8_t *ccb, caddr_t data,
     }
 
     /* wait for request to complete */
-    await(PRIBIO, 0);
+    tsleep((caddr_t)request, PRIBIO, "atprq", 0);
     splx(s);
     error = request->error;
     if (error)