]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[SCSI] 3w-9xxx: eliminate missed map_single path
authorFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Thu, 31 May 2007 06:24:03 +0000 (15:24 +0900)
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>
Thu, 31 May 2007 13:23:02 +0000 (08:23 -0500)
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>
drivers/scsi/3w-9xxx.c

index 113aaed490d413219ee593b78bbb1236f6289a2d..76c09097175f131ff9a60b77089a31f8d1932008 100644 (file)
@@ -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;