sr/sd: Remove simple dead code

PATCH New Boaz Harrosh 1 participant 1 message Dec 13, 2007 SCSI

lore

Share & tools

lore

Boaz Harrosh

author

2007-12-13 11:34 UTC #0 lore raw

PATCH 1/1 sr/sd: Remove simple dead code

if (rq_data_dir() == WRITE) else if() else chain had an extra "else" since the if() is on a value of 1 bit.

Also with a bidi request rq_data_dir() == WRITE
and blk_bidi_rq() == true.

Signed-off-by Boaz Harrosh <[email protected]>

---
 drivers/scsi/sd.c |    5 +----
 drivers/scsi/sr.c |    5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

drivers/scsi/sd.c +1 -4

index 212f6bc..e6d85b0 100644
@@ -445,12 +445,9 @@ static int sd_prep_fn(struct request_queue *q, struct request *rq)
 		}
 		SCpnt->cmnd[0] = WRITE_6;
 		SCpnt->sc_data_direction = DMA_TO_DEVICE;
-	} else if (rq_data_dir(rq) == READ) {
+	} else {
 		SCpnt->cmnd[0] = READ_6;
 		SCpnt->sc_data_direction = DMA_FROM_DEVICE;
-	} else {
-		scmd_printk(KERN_ERR, SCpnt, "Unknown command %x\n", rq->cmd_flags);
-		goto out;
 	}
 
 	SCSI_LOG_HLQUEUE(2, scmd_printk(KERN_INFO, SCpnt,

drivers/scsi/sr.c +1 -4

index 896be4a..7128d15 100644
@@ -372,12 +372,9 @@ static int sr_prep_fn(struct request_queue *q, struct request *rq)
 		SCpnt->cmnd[0] = WRITE_10;
 		SCpnt->sc_data_direction = DMA_TO_DEVICE;
  	 	cd->cdi.media_written = 1;
-	} else if (rq_data_dir(rq) == READ) {
+	} else {
 		SCpnt->cmnd[0] = READ_10;
 		SCpnt->sc_data_direction = DMA_FROM_DEVICE;
-	} else {
-		blk_dump_rq_flags(rq, "Unknown sr command");
-		goto out;
 	}
 
 	{

Signature · 1 line

1.5.3.3