patch-2.3.41 linux/drivers/scsi/sr.c

• Lines: 42
• Date: Fri Jan 21 09:48:12 2000
• Orig file: v2.3.40/linux/drivers/scsi/sr.c
• Orig date: Fri Jan 7 19:13:22 2000

diff -u --recursive --new-file v2.3.40/linux/drivers/scsi/sr.c linux/drivers/scsi/sr.c
@@ -456,18 +456,6 @@
 }
 
 
-static void sr_init_done(Scsi_Cmnd * SCpnt)
-{
-	struct request *req;
-
-	req = &SCpnt->request;
-	req->rq_status = RQ_SCSI_DONE;	/* Busy, but indicate request done */
-
-	if (req->sem != NULL) {
-		up(req->sem);
-	}
-}
-
 void get_sectorsize(int i)
 {
 	unsigned char cmd[10];
@@ -494,7 +482,7 @@
 		/* Do the command and wait.. */
 
 		scsi_wait_cmd(SCpnt, (void *) cmd, (void *) buffer,
-			      512, sr_init_done, SR_TIMEOUT, MAX_RETRIES);
+			      512, SR_TIMEOUT, MAX_RETRIES);
 
 		the_result = SCpnt->result;
 		retries--;
@@ -671,11 +659,11 @@
 
 	/* do the locking and issue the command */
 	SCpnt->request.rq_dev = cdi->dev;
-	/* scsi_do_cmd sets the command length */
+	/* scsi_wait_cmd sets the command length */
 	SCpnt->cmd_len = 0;
 
 	scsi_wait_cmd(SCpnt, (void *) cgc->cmd, (void *) buffer, cgc->buflen,
-		      sr_init_done, SR_TIMEOUT, MAX_RETRIES);
+		      SR_TIMEOUT, MAX_RETRIES);
 
 	if ((cgc->stat = SCpnt->result))
 		cgc->sense = (struct request_sense *) SCpnt->sense_buffer;