Cleanup sweep.

1 files changed, 13 insertions, 13 deletions

diff --git a/sys/dev/ata/atapi-tape.c b/sys/dev/ata/atapi-tape.c
index 2f3b4d3..53b546e 100644
--- a/sys/dev/ata/atapi-tape.c
+++ b/sys/dev/ata/atapi-tape.c
@@ -469,12 +469,12 @@ ast_start(struct atapi_softc *atp)
     if (bp->b_flags & B_READ) {
 	ccb[0] = ATAPI_READ;
 	if (!(stp->flags & ATAPI_F_DSC_USED))
-	    atapi_queue_cmd(stp->atp, ccb, NULL, 0, 0, 2*60, NULL, NULL, NULL);
+	    atapi_queue_cmd(stp->atp, ccb, NULL, 0, 0, 2*60, NULL, NULL);
     } 
     else {
 	ccb[0] = ATAPI_WRITE;
 	if (!(stp->flags & ATAPI_F_DSC_USED))
-	    atapi_queue_cmd(stp->atp, ccb, NULL, 0, 0, 2*60, NULL, NULL, NULL);
+	    atapi_queue_cmd(stp->atp, ccb, NULL, 0, 0, 2*60, NULL, NULL);
     } 
     
     bufq_remove(&stp->buf_queue, bp);
@@ -488,7 +488,7 @@ ast_start(struct atapi_softc *atp)
     devstat_start_transaction(&stp->stats);
 
     atapi_queue_cmd(stp->atp, ccb, bp->b_data, blkcount * stp->blksize, 
-		    bp->b_flags&B_READ ? ATPR_F_READ : 0, 60, ast_done, stp,bp);
+		    bp->b_flags&B_READ ? ATPR_F_READ : 0, 60, ast_done, bp);
 }
 
 static int32_t 
@@ -521,7 +521,7 @@ ast_mode_sense(struct ast_softc *stp, u_int8_t page,
     int32_t error;
  
     error = atapi_queue_cmd(stp->atp, ccb, pagebuf, pagesize, ATPR_F_READ, 10, 
-			    NULL, NULL, NULL);
+			    NULL, NULL);
 #ifdef AST_DEBUG
     atapi_dump("ast: mode sense ", pagebuf, pagesize);
 #endif
@@ -539,7 +539,7 @@ ast_mode_select(struct ast_softc *stp, void *pagebuf, int32_t pagesize)
     atapi_dump("ast: mode select ", pagebuf, pagesize);
 #endif
     return atapi_queue_cmd(stp->atp, ccb, pagebuf, pagesize, 0, 10,
-			   NULL, NULL, NULL);
+			   NULL, NULL);
 }
 
 static int32_t
@@ -559,7 +559,7 @@ ast_write_filemark(struct ast_softc *stp, u_int8_t function)
 		stp->flags |= F_FM_WRITTEN;
 	}
     }
-    error = atapi_queue_cmd(stp->atp, ccb, NULL, 0, 0, 10, NULL, NULL, NULL);
+    error = atapi_queue_cmd(stp->atp, ccb, NULL, 0, 0, 10, NULL, NULL);
     if (error)
 	return error;
     return atapi_wait_ready(stp->atp, 10*60);
@@ -575,7 +575,7 @@ ast_read_position(struct ast_softc *stp, int32_t hard,
 
     error = atapi_queue_cmd(stp->atp, ccb, position, 
 			    sizeof(struct ast_readposition), ATPR_F_READ, 10,
-			    NULL, NULL, NULL);
+			    NULL, NULL);
     position->tape = ntohl(position->tape);
     position->host = ntohl(position->host);
     return error;
@@ -587,7 +587,7 @@ ast_space(struct ast_softc *stp, u_int8_t function, u_int32_t count)
     int8_t ccb[16] = { ATAPI_SPACE, function, count>>16, count>>8, count,
 		       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
 
-    return atapi_queue_cmd(stp->atp, ccb, NULL, 0, 0, 60*60, NULL, NULL, NULL);
+    return atapi_queue_cmd(stp->atp, ccb, NULL, 0, 0, 60*60, NULL, NULL);
 }
 
 static int32_t
@@ -598,7 +598,7 @@ ast_locate(struct ast_softc *stp, int32_t hard, int32_t pos)
 		       0, 0, 0, 0, 0, 0, 0, 0, 0 };
     int32_t error;
 
-    error = atapi_queue_cmd(stp->atp, ccb, NULL, 0, 0, 10, NULL, NULL, NULL);
+    error = atapi_queue_cmd(stp->atp, ccb, NULL, 0, 0, 10, NULL, NULL);
     if (error)
 	return error;
     return atapi_wait_ready(stp->atp, 60*60);
@@ -610,7 +610,7 @@ ast_prevent_allow(struct ast_softc *stp, int32_t lock)
     int8_t ccb[16] = { ATAPI_PREVENT_ALLOW, 0, 0, 0, lock,
 		       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
 
-    return atapi_queue_cmd(stp->atp, ccb, NULL, 0, 0,30, NULL, NULL, NULL);
+    return atapi_queue_cmd(stp->atp, ccb, NULL, 0, 0,30, NULL, NULL);
 }
 
 static int32_t
@@ -622,7 +622,7 @@ ast_load_unload(struct ast_softc *stp, u_int8_t function)
 
     if ((function & SS_EJECT) && !stp->cap.eject)
 	return 0;
-    error = atapi_queue_cmd(stp->atp, ccb, NULL, 0, 0, 10, NULL, NULL, NULL);
+    error = atapi_queue_cmd(stp->atp, ccb, NULL, 0, 0, 10, NULL, NULL);
     if (error)
 	return error;
     tsleep((caddr_t)&error, PRIBIO, "astlu", 1 * hz);
@@ -638,7 +638,7 @@ ast_rewind(struct ast_softc *stp)
 		       0, 0, 0, 0, 0, 0, 0, 0 };
     int32_t error;
 
-    error = atapi_queue_cmd(stp->atp, ccb, NULL, 0, 0, 10, NULL, NULL, NULL);
+    error = atapi_queue_cmd(stp->atp, ccb, NULL, 0, 0, 10, NULL, NULL);
     if (error)
 	return error;
     return atapi_wait_ready(stp->atp, 60*60);
@@ -654,5 +654,5 @@ ast_erase(struct ast_softc *stp)
     if ((error = ast_rewind(stp)))
 	return error;
 
-    return atapi_queue_cmd(stp->atp, ccb, NULL, 0, 0, 60*60, NULL, NULL, NULL);
+    return atapi_queue_cmd(stp->atp, ccb, NULL, 0, 0, 60*60, NULL, NULL);
 }