From: FUJITA Tomonori Date: Thu, 31 May 2007 06:24:03 +0000 (+0900) Subject: [SCSI] 3w-9xxx: eliminate missed map_single path X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b1192d5ebab2f1664295a748b6ee6e89f3b07188;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git [SCSI] 3w-9xxx: eliminate missed map_single path This removes the remaining unnecessary map_single path Signed-off-by: FUJITA Tomonori Signed-off-by: James Bottomley --- 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;