diff options
| author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2007-05-31 08:24:03 +0200 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-05-31 15:23:02 +0200 |
| commit | b1192d5ebab2f1664295a748b6ee6e89f3b07188 (patch) | |
| tree | 8b1739a49bc7179fbda7c298a7023699f67cbffb /drivers/scsi/3w-9xxx.c | |
| parent | [SCSI] Merge up to linux-2.6 head (diff) | |
| download | linux-b1192d5ebab2f1664295a748b6ee6e89f3b07188.tar.xz linux-b1192d5ebab2f1664295a748b6ee6e89f3b07188.zip | |
[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.c | 8 |
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: 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; |