[SCSI] tmscsim: Further clean-up of the driver
authorBoaz Harrosh <bharrosh@panasas.com>
Wed, 4 Jul 2007 18:18:55 +0000 (21:18 +0300)
committerJames Bottomley <jejb@mulgrave.localdomain>
Sat, 14 Jul 2007 23:56:33 +0000 (18:56 -0500)
 - The saved sg_count was a leftover from the time the driver was doing
   dma mapping by himself. But now that scsi-ml is called for the mapping
   it is not the drivers responsibility.

Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>
Acked-by: G. Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
drivers/scsi/tmscsim.c
drivers/scsi/tmscsim.h

index e8260f2dba0fdfcf6356a3542132e4396197dfb6..14cba1ca38b39139f9e201b5e0835bf16aa13b43 100644 (file)
@@ -1681,7 +1681,6 @@ dc390_RequestSense(struct dc390_acb* pACB, struct dc390_dcb* pDCB, struct dc390_
                              pcmd->cmnd[0], pDCB->TargetID, pDCB->TargetLUN));
 
        pSRB->SRBFlag |= AUTO_REQSENSE;
-       pSRB->SavedSGCount = scsi_sg_count(pcmd);
        pSRB->SavedTotXLen = pSRB->TotalXferredLen;
        pSRB->AdaptStatus = 0;
        pSRB->TargetStatus = 0; /* CHECK_CONDITION<<1; */
@@ -1729,7 +1728,6 @@ dc390_SRBdone( struct dc390_acb* pACB, struct dc390_dcb* pDCB, struct dc390_srb*
                       (u32) pcmd->result, (u32) pSRB->TotalXferredLen));
            } else {
                SET_RES_DRV(pcmd->result, DRIVER_SENSE);
-               scsi_sg_count(pcmd) = pSRB->SavedSGCount;
                //pSRB->ScsiCmdLen       = (u8) (pSRB->Segment1[0] >> 8);
                DEBUG0 (printk ("DC390: RETRY pid %li (%02x), target %02i-%02i\n", pcmd->pid, pcmd->cmnd[0], pcmd->device->id, pcmd->device->lun));
                pSRB->TotalXferredLen = 0;
@@ -1751,7 +1749,6 @@ dc390_SRBdone( struct dc390_acb* pACB, struct dc390_dcb* pDCB, struct dc390_srb*
        else if (status == SAM_STAT_TASK_SET_FULL)
        {
            scsi_track_queue_full(pcmd->device, pDCB->GoingSRBCnt - 1);
-           scsi_sg_count(pcmd) = pSRB->SavedSGCount;
            DEBUG0 (printk ("DC390: RETRY pid %li (%02x), target %02i-%02i\n", pcmd->pid, pcmd->cmnd[0], pcmd->device->id, pcmd->device->lun));
            pSRB->TotalXferredLen = 0;
            SET_RES_DID(pcmd->result, DID_SOFT_ERROR);
index c74c72aadb087bca3323a90e90e4bcb2d4577e10..77adc54dbd16589041c62a3da8171fd74b24e519 100644 (file)
@@ -57,7 +57,6 @@ u8            SGcount;
 
 u8             MsgCnt;
 u8             EndMessage;
-u8             SavedSGCount;                   
 
 u8             MsgInBuf[6];
 u8             MsgOutBuf[6];