aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/3w-9xxx.c
diff options
context:
space:
mode:
authorFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2007-05-31 02:24:03 -0400
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>2007-05-31 09:23:02 -0400
commitb1192d5ebab2f1664295a748b6ee6e89f3b07188 (patch)
tree8b1739a49bc7179fbda7c298a7023699f67cbffb /drivers/scsi/3w-9xxx.c
parent5bc65793cbf8da0d35f19ef025dda22887e79e80 (diff)
[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>
Diffstat (limited to 'drivers/scsi/3w-9xxx.c')
-rw-r--r--drivers/scsi/3w-9xxx.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/scsi/3w-9xxx.c b/drivers/scsi/3w-9xxx.c
index 113aaed490d4..76c09097175f 100644
--- a/drivers/scsi/3w-9xxx.c
+++ b/drivers/scsi/3w-9xxx.c
@@ -1902,17 +1902,11 @@ out:
1902static void twa_scsiop_execute_scsi_complete(TW_Device_Extension *tw_dev, int request_id) 1902static void twa_scsiop_execute_scsi_complete(TW_Device_Extension *tw_dev, int request_id)
1903{ 1903{
1904 struct scsi_cmnd *cmd = tw_dev->srb[request_id]; 1904 struct scsi_cmnd *cmd = tw_dev->srb[request_id];
1905 int use_sg = scsi_sg_count(cmd);
1906 1905
1907 if (scsi_bufflen(cmd) < TW_MIN_SGL_LENGTH && 1906 if (scsi_bufflen(cmd) < TW_MIN_SGL_LENGTH &&
1908 (cmd->sc_data_direction == DMA_FROM_DEVICE || 1907 (cmd->sc_data_direction == DMA_FROM_DEVICE ||
1909 cmd->sc_data_direction == DMA_BIDIRECTIONAL)) { 1908 cmd->sc_data_direction == DMA_BIDIRECTIONAL)) {
1910 if (!use_sg) 1909 if (scsi_sg_count(cmd) == 1) {
1911 memcpy(scsi_sglist(cmd),
1912 tw_dev->generic_buffer_virt[request_id],
1913 scsi_bufflen(cmd));
1914
1915 if (use_sg == 1) {
1916 struct scatterlist *sg = scsi_sglist(tw_dev->srb[request_id]); 1910 struct scatterlist *sg = scsi_sglist(tw_dev->srb[request_id]);
1917 char *buf; 1911 char *buf;
1918 unsigned long flags = 0; 1912 unsigned long flags = 0;