1 files changed, 21 insertions, 30 deletions

diff --git a/drivers/scsi/BusLogic.c b/drivers/scsi/BusLogic.c
index 96f4cab07614..9b206176f717 100644
--- a/drivers/scsi/BusLogic.c
+++ b/drivers/scsi/BusLogic.c
@@ -304,18 +304,10 @@ static struct BusLogic_CCB *BusLogic_AllocateCCB(struct BusLogic_HostAdapter
 static void BusLogic_DeallocateCCB(struct BusLogic_CCB *CCB)
 {
         struct BusLogic_HostAdapter *HostAdapter = CCB->HostAdapter;
-        struct scsi_cmnd *cmd = CCB->Command;
 
-        if (cmd->use_sg != 0) {
-                pci_unmap_sg(HostAdapter->PCI_Device,
-                                (struct scatterlist *)cmd->request_buffer,
-                                cmd->use_sg, cmd->sc_data_direction);
-        } else if (cmd->request_bufflen != 0) {
-                pci_unmap_single(HostAdapter->PCI_Device, CCB->DataPointer,
-                                CCB->DataLength, cmd->sc_data_direction);
-        }
+        scsi_dma_unmap(CCB->Command);
         pci_unmap_single(HostAdapter->PCI_Device, CCB->SenseDataPointer,
-                        CCB->SenseDataLength, PCI_DMA_FROMDEVICE);
+                         CCB->SenseDataLength, PCI_DMA_FROMDEVICE);
 
         CCB->Command = NULL;
         CCB->Status = BusLogic_CCB_Free;
@@ -2648,7 +2640,8 @@ static void BusLogic_ProcessCompletedCCBs(struct BusLogic_HostAdapter *HostAdapt
                          */
                         if (CCB->CDB[0] == INQUIRY && CCB->CDB[1] == 0 && CCB->HostAdapterStatus == BusLogic_CommandCompletedNormally) {
                                 struct BusLogic_TargetFlags *TargetFlags = &HostAdapter->TargetFlags[CCB->TargetID];
-                                struct SCSI_Inquiry *InquiryResult = (struct SCSI_Inquiry *) Command->request_buffer;
+                                struct SCSI_Inquiry *InquiryResult =
+                                        (struct SCSI_Inquiry *) scsi_sglist(Command);
                                 TargetFlags->TargetExists = true;
                                 TargetFlags->TaggedQueuingSupported = InquiryResult->CmdQue;
                                 TargetFlags->WideTransfersSupported = InquiryResult->WBus16;
@@ -2819,9 +2812,8 @@ static int BusLogic_QueueCommand(struct scsi_cmnd *Command, void (*CompletionRou
         int CDB_Length = Command->cmd_len;
         int TargetID = Command->device->id;
         int LogicalUnit = Command->device->lun;
-        void *BufferPointer = Command->request_buffer;
-        int BufferLength = Command->request_bufflen;
-        int SegmentCount = Command->use_sg;
+        int BufferLength = scsi_bufflen(Command);
+        int Count;
         struct BusLogic_CCB *CCB;
         /*
            SCSI REQUEST_SENSE commands will be executed automatically by the Host
@@ -2851,36 +2843,35 @@ static int BusLogic_QueueCommand(struct scsi_cmnd *Command, void (*CompletionRou
                         return 0;
                 }
         }
+
         /*
            Initialize the fields in the BusLogic Command Control Block (CCB).
          */
-        if (SegmentCount == 0 && BufferLength != 0) {
-                CCB->Opcode = BusLogic_InitiatorCCB;
-                CCB->DataLength = BufferLength;
-                CCB->DataPointer = pci_map_single(HostAdapter->PCI_Device,
-                                BufferPointer, BufferLength,
-                                Command->sc_data_direction);
-        } else if (SegmentCount != 0) {
-                struct scatterlist *ScatterList = (struct scatterlist *) BufferPointer;
-                int Segment, Count;
-
-                Count = pci_map_sg(HostAdapter->PCI_Device, ScatterList, SegmentCount,
-                                Command->sc_data_direction);
+        Count = scsi_dma_map(Command);
+        BUG_ON(Count < 0);
+        if (Count) {
+                struct scatterlist *sg;
+                int i;
+
                 CCB->Opcode = BusLogic_InitiatorCCB_ScatterGather;
                 CCB->DataLength = Count * sizeof(struct BusLogic_ScatterGatherSegment);
                 if (BusLogic_MultiMasterHostAdapterP(HostAdapter))
                         CCB->DataPointer = (unsigned int) CCB->DMA_Handle + ((unsigned long) &CCB->ScatterGatherList - (unsigned long) CCB);
                 else
                         CCB->DataPointer = Virtual_to_32Bit_Virtual(CCB->ScatterGatherList);
-                for (Segment = 0; Segment < Count; Segment++) {
-                        CCB->ScatterGatherList[Segment].SegmentByteCount = sg_dma_len(ScatterList + Segment);
-                        CCB->ScatterGatherList[Segment].SegmentDataPointer = sg_dma_address(ScatterList + Segment);
+
+                scsi_for_each_sg(Command, sg, Count, i) {
+                        CCB->ScatterGatherList[i].SegmentByteCount =
+                                sg_dma_len(sg);
+                        CCB->ScatterGatherList[i].SegmentDataPointer =
+                                sg_dma_address(sg);
                 }
-        } else {
+        } else if (!Count) {
                 CCB->Opcode = BusLogic_InitiatorCCB;
                 CCB->DataLength = BufferLength;
                 CCB->DataPointer = 0;
         }
+
         switch (CDB[0]) {
         case READ_6:
         case READ_10: