1 files changed, 2 insertions, 12 deletions

diff --git a/drivers/scsi/3w-xxxx.c b/drivers/scsi/3w-xxxx.c
index d09532162217..adb98a297210 100644
--- a/drivers/scsi/3w-xxxx.c
+++ b/drivers/scsi/3w-xxxx.c
@@ -1463,18 +1463,10 @@ static void tw_transfer_internal(TW_Device_Extension *tw_dev, int request_id,
                                  void *data, unsigned int len)
 {
         struct scsi_cmnd *cmd = tw_dev->srb[request_id];
-        void *buf;
-        unsigned int transfer_len;
-        unsigned long flags = 0;
-        struct scatterlist *sg = scsi_sglist(cmd);
+        unsigned long flags;
 
         local_irq_save(flags);
-        buf = kmap_atomic(sg_page(sg), KM_IRQ0) + sg->offset;
-        transfer_len = min(sg->length, len);
-
-        memcpy(buf, data, transfer_len);
-
-        kunmap_atomic(buf - sg->offset, KM_IRQ0);
+        scsi_sg_copy_from_buffer(cmd, data, len);
         local_irq_restore(flags);
 }
 
@@ -2294,8 +2286,6 @@ static int __devinit tw_probe(struct pci_dev *pdev, const struct pci_device_id *
         }
         tw_dev = (TW_Device_Extension *)host->hostdata;
 
-        memset(tw_dev, 0, sizeof(TW_Device_Extension));
-
         /* Save values to device extension */
         tw_dev->host = host;
         tw_dev->tw_pci_dev = pdev;