1 files changed, 33 insertions, 52 deletions

diff --git a/drivers/scsi/tmscsim.c b/drivers/scsi/tmscsim.c
index e7b85e832eb5..14cba1ca38b3 100644
--- a/drivers/scsi/tmscsim.c
+++ b/drivers/scsi/tmscsim.c
@@ -457,28 +457,21 @@ static int dc390_pci_map (struct dc390_srb* pSRB)
                         error = 1;
                 DEBUG1(printk("%s(): Mapped sense buffer %p at %x\n", __FUNCTION__, pcmd->sense_buffer, cmdp->saved_dma_handle));
         /* Map SG list */
-        } else if (pcmd->use_sg) {
-                pSRB->pSegmentList      = (struct scatterlist *) pcmd->request_buffer;
-                pSRB->SGcount           = pci_map_sg(pdev, pSRB->pSegmentList, pcmd->use_sg,
-                                                     pcmd->sc_data_direction);
+        } else if (scsi_sg_count(pcmd)) {
+                int nseg;
+
+                nseg = scsi_dma_map(pcmd);
+
+                pSRB->pSegmentList      = scsi_sglist(pcmd);
+                pSRB->SGcount           = nseg;
+
                 /* TODO: error handling */
-                if (!pSRB->SGcount)
+                if (nseg < 0)
                         error = 1;
                 DEBUG1(printk("%s(): Mapped SG %p with %d (%d) elements\n",\
-                              __FUNCTION__, pcmd->request_buffer, pSRB->SGcount, pcmd->use_sg));
+                              __FUNCTION__, scsi_sglist(pcmd), nseg, scsi_sg_count(pcmd)));
         /* Map single segment */
-        } else if (pcmd->request_buffer && pcmd->request_bufflen) {
-                pSRB->pSegmentList      = dc390_sg_build_single(&pSRB->Segmentx, pcmd->request_buffer, pcmd->request_bufflen);
-                pSRB->SGcount           = pci_map_sg(pdev, pSRB->pSegmentList, 1,
-                                                     pcmd->sc_data_direction);
-                cmdp->saved_dma_handle  = sg_dma_address(pSRB->pSegmentList);
-
-                /* TODO: error handling */
-                if (pSRB->SGcount != 1)
-                        error = 1;
-                DEBUG1(printk("%s(): Mapped request buffer %p at %x\n", __FUNCTION__, pcmd->request_buffer, cmdp->saved_dma_handle));
-        /* No mapping !? */     
-        } else
+        } else
                 pSRB->SGcount = 0;
 
         return error;
@@ -494,12 +487,10 @@ static void dc390_pci_unmap (struct dc390_srb* pSRB)
         if (pSRB->SRBFlag) {
                 pci_unmap_sg(pdev, &pSRB->Segmentx, 1, DMA_FROM_DEVICE);
                 DEBUG1(printk("%s(): Unmapped sense buffer at %x\n", __FUNCTION__, cmdp->saved_dma_handle));
-        } else if (pcmd->use_sg) {
-                pci_unmap_sg(pdev, pcmd->request_buffer, pcmd->use_sg, pcmd->sc_data_direction);
-                DEBUG1(printk("%s(): Unmapped SG at %p with %d elements\n", __FUNCTION__, pcmd->request_buffer, pcmd->use_sg));
-        } else if (pcmd->request_buffer && pcmd->request_bufflen) {
-                pci_unmap_sg(pdev, &pSRB->Segmentx, 1, pcmd->sc_data_direction);
-                DEBUG1(printk("%s(): Unmapped request buffer at %x\n", __FUNCTION__, cmdp->saved_dma_handle));
+        } else {
+                scsi_dma_unmap(pcmd);
+                DEBUG1(printk("%s(): Unmapped SG at %p with %d elements\n",
+                              __FUNCTION__, scsi_sglist(pcmd), scsi_sg_count(pcmd)));
         }
 }
 
@@ -1153,9 +1144,9 @@ dc390_restore_ptr (struct dc390_acb* pACB, struct dc390_srb* pSRB)
     struct scatterlist *psgl;
     pSRB->TotalXferredLen = 0;
     pSRB->SGIndex = 0;
-    if (pcmd->use_sg) {
+    if (scsi_sg_count(pcmd)) {
         size_t saved;
-        pSRB->pSegmentList = (struct scatterlist *)pcmd->request_buffer;
+        pSRB->pSegmentList = scsi_sglist(pcmd);
         psgl = pSRB->pSegmentList;
         //dc390_pci_sync(pSRB);
 
@@ -1179,12 +1170,6 @@ dc390_restore_ptr (struct dc390_acb* pACB, struct dc390_srb* pSRB)
         printk (KERN_INFO "DC390: Pointer restored. Segment %i, Total %li, Bus %08lx\n",
                 pSRB->SGIndex, pSRB->Saved_Ptr, pSRB->SGBusAddr);
 
-    } else if(pcmd->request_buffer) {
-        //dc390_pci_sync(pSRB);
-
-        sg_dma_len(&pSRB->Segmentx) = pcmd->request_bufflen - pSRB->Saved_Ptr;
-        pSRB->SGcount = 1;
-        pSRB->pSegmentList = (struct scatterlist *) &pSRB->Segmentx;
     } else {
          pSRB->SGcount = 0;
          printk (KERN_INFO "DC390: RESTORE_PTR message for Transfer without Scatter-Gather ??\n");
@@ -1579,7 +1564,8 @@ dc390_Disconnect( struct dc390_acb* pACB )
         if( (pSRB->SRBState & (SRB_START_+SRB_MSGOUT)) ||
            !(pSRB->SRBState & (SRB_DISCONNECT+SRB_COMPLETED)) )
         {       /* Selection time out */
-                pSRB->TargetStatus = SCSI_STAT_SEL_TIMEOUT;
+                pSRB->AdaptStatus = H_SEL_TIMEOUT;
+                pSRB->TargetStatus = 0;
                 goto  disc1;
         }
         else if (!(pSRB->SRBState & SRB_DISCONNECT) && (pSRB->SRBState & SRB_COMPLETED))
@@ -1612,7 +1598,7 @@ dc390_Reselect( struct dc390_acb* pACB )
         if( !( pACB->scan_devices ) )
         {
             struct scsi_cmnd *pcmd = pSRB->pcmd;
-            pcmd->resid = pcmd->request_bufflen;
+            scsi_set_resid(pcmd, scsi_bufflen(pcmd));
             SET_RES_DID(pcmd->result, DID_SOFT_ERROR);
             dc390_Going_remove(pDCB, pSRB);
             dc390_Free_insert(pACB, pSRB);
@@ -1695,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 = pcmd->use_sg;
         pSRB->SavedTotXLen = pSRB->TotalXferredLen;
         pSRB->AdaptStatus = 0;
         pSRB->TargetStatus = 0; /* CHECK_CONDITION<<1; */
@@ -1728,22 +1713,21 @@ dc390_SRBdone( struct dc390_acb* pACB, struct dc390_dcb* pDCB, struct dc390_srb*
     {   /* Last command was a Request Sense */
         pSRB->SRBFlag &= ~AUTO_REQSENSE;
         pSRB->AdaptStatus = 0;
-        pSRB->TargetStatus = CHECK_CONDITION << 1;
+        pSRB->TargetStatus = SAM_STAT_CHECK_CONDITION;
 
         //pcmd->result = MK_RES(DRIVER_SENSE,DID_OK,0,status);
-        if (status == (CHECK_CONDITION << 1))
+        if (status == SAM_STAT_CHECK_CONDITION)
             pcmd->result = MK_RES_LNX(0, DID_BAD_TARGET, 0, /*CHECK_CONDITION*/0);
         else /* Retry */
         {
             if( pSRB->pcmd->cmnd[0] == TEST_UNIT_READY /* || pSRB->pcmd->cmnd[0] == START_STOP */)
             {
                 /* Don't retry on TEST_UNIT_READY */
-                pcmd->result = MK_RES_LNX(DRIVER_SENSE,DID_OK,0,CHECK_CONDITION);
+                pcmd->result = MK_RES_LNX(DRIVER_SENSE, DID_OK, 0, SAM_STAT_CHECK_CONDITION);
                 REMOVABLEDEBUG(printk(KERN_INFO "Cmd=%02x, Result=%08x, XferL=%08x\n",pSRB->pcmd->cmnd[0],\
                        (u32) pcmd->result, (u32) pSRB->TotalXferredLen));
             } else {
                 SET_RES_DRV(pcmd->result, DRIVER_SENSE);
-                pcmd->use_sg = 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;
@@ -1754,7 +1738,7 @@ dc390_SRBdone( struct dc390_acb* pACB, struct dc390_dcb* pDCB, struct dc390_srb*
     }
     if( status )
     {
-        if( status_byte(status) == CHECK_CONDITION )
+        if (status == SAM_STAT_CHECK_CONDITION)
         {
             if (dc390_RequestSense(pACB, pDCB, pSRB)) {
                 SET_RES_DID(pcmd->result, DID_ERROR);
@@ -1762,22 +1746,14 @@ dc390_SRBdone( struct dc390_acb* pACB, struct dc390_dcb* pDCB, struct dc390_srb*
             }
             return;
         }
-        else if( status_byte(status) == QUEUE_FULL )
+        else if (status == SAM_STAT_TASK_SET_FULL)
         {
             scsi_track_queue_full(pcmd->device, pDCB->GoingSRBCnt - 1);
-            pcmd->use_sg = 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);
         }
-        else if(status == SCSI_STAT_SEL_TIMEOUT)
-        {
-            pSRB->AdaptStatus = H_SEL_TIMEOUT;
-            pSRB->TargetStatus = 0;
-            pcmd->result = MK_RES(0,DID_NO_CONNECT,0,0);
-            /* Devices are removed below ... */
-        }
-        else if (status_byte(status) == BUSY && 
+        else if (status == SAM_STAT_BUSY &&
                  (pcmd->cmnd[0] == TEST_UNIT_READY || pcmd->cmnd[0] == INQUIRY) &&
                  pACB->scan_devices)
         {
@@ -1795,12 +1771,17 @@ dc390_SRBdone( struct dc390_acb* pACB, struct dc390_dcb* pDCB, struct dc390_srb*
     else
     {   /*  Target status == 0 */
         status = pSRB->AdaptStatus;
-        if(status & H_OVER_UNDER_RUN)
+        if (status == H_OVER_UNDER_RUN)
         {
             pSRB->TargetStatus = 0;
             SET_RES_DID(pcmd->result,DID_OK);
             SET_RES_MSG(pcmd->result,pSRB->EndMessage);
         }
+        else if (status == H_SEL_TIMEOUT)
+        {
+            pcmd->result = MK_RES(0, DID_NO_CONNECT, 0, 0);
+            /* Devices are removed below ... */
+        }
         else if( pSRB->SRBStatus & PARITY_ERROR)
         {
             //pcmd->result = MK_RES(0,DID_PARITY,pSRB->EndMessage,0);
@@ -1816,7 +1797,7 @@ dc390_SRBdone( struct dc390_acb* pACB, struct dc390_dcb* pDCB, struct dc390_srb*
     }
 
 cmd_done:
-    pcmd->resid = pcmd->request_bufflen - pSRB->TotalXferredLen;
+    scsi_set_resid(pcmd, scsi_bufflen(pcmd) - pSRB->TotalXferredLen);
 
     dc390_Going_remove (pDCB, pSRB);
     /* Add to free list */