From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Date: Thu, 31 May 2007 06:24:03 +0000 (+0900)
Subject: [SCSI] 3w-9xxx: eliminate missed map_single path
X-Git-Tag: v2.6.23-rc1~1053^2~102
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b1192d5ebab2f1664295a748b6ee6e89f3b07188;p=linux-2.6

[SCSI] 3w-9xxx: eliminate missed map_single path

This removes the remaining unnecessary map_single path

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
---

diff --git a/drivers/scsi/3w-9xxx.c b/drivers/scsi/3w-9xxx.c
index 113aaed490..76c0909717 100644
--- a/drivers/scsi/3w-9xxx.c
+++ b/drivers/scsi/3w-9xxx.c
@@ -1902,17 +1902,11 @@ out:
 static void twa_scsiop_execute_scsi_complete(TW_Device_Extension *tw_dev, int request_id)
 {
 	struct scsi_cmnd *cmd = tw_dev->srb[request_id];
-	int use_sg = scsi_sg_count(cmd);
 
 	if (scsi_bufflen(cmd) < TW_MIN_SGL_LENGTH &&
 	    (cmd->sc_data_direction == DMA_FROM_DEVICE ||
 	     cmd->sc_data_direction == DMA_BIDIRECTIONAL)) {
-		if (!use_sg)
-			memcpy(scsi_sglist(cmd),
-			       tw_dev->generic_buffer_virt[request_id],
-			       scsi_bufflen(cmd));
-
-		if (use_sg == 1) {
+		if (scsi_sg_count(cmd) == 1) {
 			struct scatterlist *sg = scsi_sglist(tw_dev->srb[request_id]);
 			char *buf;
 			unsigned long flags = 0;