1 files changed, 25 insertions, 52 deletions

diff --git a/drivers/scsi/53c700.c b/drivers/scsi/53c700.c
index cb02656eb54c..71ff3fbfce12 100644
--- a/drivers/scsi/53c700.c
+++ b/drivers/scsi/53c700.c
@@ -267,8 +267,6 @@ NCR_700_offset_period_to_sxfer(struct NCR_700_Host_Parameters *hostdata,
                 offset = max_offset;
         }
         if(XFERP < min_xferp) {
-                printk(KERN_WARNING "53c700: XFERP %d is less than minium, setting to %d\n",
-                       XFERP,  min_xferp);
                 XFERP =  min_xferp;
         }
         return (offset & 0x0f) | (XFERP & 0x07)<<4;
@@ -585,16 +583,8 @@ NCR_700_unmap(struct NCR_700_Host_Parameters *hostdata, struct scsi_cmnd *SCp,
               struct NCR_700_command_slot *slot)
 {
         if(SCp->sc_data_direction != DMA_NONE &&
-           SCp->sc_data_direction != DMA_BIDIRECTIONAL) {
-                if(SCp->use_sg) {
-                        dma_unmap_sg(hostdata->dev, SCp->request_buffer,
-                                     SCp->use_sg, SCp->sc_data_direction);
-                } else {
-                        dma_unmap_single(hostdata->dev, slot->dma_handle,
-                                         SCp->request_bufflen,
-                                         SCp->sc_data_direction);
-                }
-        }
+           SCp->sc_data_direction != DMA_BIDIRECTIONAL)
+                scsi_dma_unmap(SCp);
 }
 
 STATIC inline void
@@ -661,7 +651,6 @@ NCR_700_chip_setup(struct Scsi_Host *host)
 {
         struct NCR_700_Host_Parameters *hostdata = 
                 (struct NCR_700_Host_Parameters *)host->hostdata[0];
-        __u32 dcntl_extra = 0;
         __u8 min_period;
         __u8 min_xferp = (hostdata->chip710 ? NCR_710_MIN_XFERP : NCR_700_MIN_XFERP);
 
@@ -686,13 +675,14 @@ NCR_700_chip_setup(struct Scsi_Host *host)
                                 burst_disable = BURST_DISABLE;
                                 break;
                 }
-                dcntl_extra = COMPAT_700_MODE;
+                hostdata->dcntl_extra |= COMPAT_700_MODE;
 
-                NCR_700_writeb(dcntl_extra, host, DCNTL_REG);
+                NCR_700_writeb(hostdata->dcntl_extra, host, DCNTL_REG);
                 NCR_700_writeb(burst_length | hostdata->dmode_extra,
                                host, DMODE_710_REG);
-                NCR_700_writeb(burst_disable | (hostdata->differential ? 
-                                                DIFF : 0), host, CTEST7_REG);
+                NCR_700_writeb(burst_disable | hostdata->ctest7_extra |
+                               (hostdata->differential ? DIFF : 0),
+                               host, CTEST7_REG);
                 NCR_700_writeb(BTB_TIMER_DISABLE, host, CTEST0_REG);
                 NCR_700_writeb(FULL_ARBITRATION | ENABLE_PARITY | PARITY
                                | AUTO_ATN, host, SCNTL0_REG);
@@ -727,13 +717,13 @@ NCR_700_chip_setup(struct Scsi_Host *host)
                  * of spec: sync divider 2, async divider 3 */
                 DEBUG(("53c700: sync 2 async 3\n"));
                 NCR_700_writeb(SYNC_DIV_2_0, host, SBCL_REG);
-                NCR_700_writeb(ASYNC_DIV_3_0 | dcntl_extra, host, DCNTL_REG);
+                NCR_700_writeb(ASYNC_DIV_3_0 | hostdata->dcntl_extra, host, DCNTL_REG);
                 hostdata->sync_clock = hostdata->clock/2;
         } else  if(hostdata->clock > 50  && hostdata->clock <= 75) {
                 /* sync divider 1.5, async divider 3 */
                 DEBUG(("53c700: sync 1.5 async 3\n"));
                 NCR_700_writeb(SYNC_DIV_1_5, host, SBCL_REG);
-                NCR_700_writeb(ASYNC_DIV_3_0 | dcntl_extra, host, DCNTL_REG);
+                NCR_700_writeb(ASYNC_DIV_3_0 | hostdata->dcntl_extra, host, DCNTL_REG);
                 hostdata->sync_clock = hostdata->clock*2;
                 hostdata->sync_clock /= 3;
                 
@@ -741,18 +731,18 @@ NCR_700_chip_setup(struct Scsi_Host *host)
                 /* sync divider 1, async divider 2 */
                 DEBUG(("53c700: sync 1 async 2\n"));
                 NCR_700_writeb(SYNC_DIV_1_0, host, SBCL_REG);
-                NCR_700_writeb(ASYNC_DIV_2_0 | dcntl_extra, host, DCNTL_REG);
+                NCR_700_writeb(ASYNC_DIV_2_0 | hostdata->dcntl_extra, host, DCNTL_REG);
                 hostdata->sync_clock = hostdata->clock;
         } else if(hostdata->clock > 25 && hostdata->clock <=37) {
                 /* sync divider 1, async divider 1.5 */
                 DEBUG(("53c700: sync 1 async 1.5\n"));
                 NCR_700_writeb(SYNC_DIV_1_0, host, SBCL_REG);
-                NCR_700_writeb(ASYNC_DIV_1_5 | dcntl_extra, host, DCNTL_REG);
+                NCR_700_writeb(ASYNC_DIV_1_5 | hostdata->dcntl_extra, host, DCNTL_REG);
                 hostdata->sync_clock = hostdata->clock;
         } else {
                 DEBUG(("53c700: sync 1 async 1\n"));
                 NCR_700_writeb(SYNC_DIV_1_0, host, SBCL_REG);
-                NCR_700_writeb(ASYNC_DIV_1_0 | dcntl_extra, host, DCNTL_REG);
+                NCR_700_writeb(ASYNC_DIV_1_0 | hostdata->dcntl_extra, host, DCNTL_REG);
                 /* sync divider 1, async divider 1 */
                 hostdata->sync_clock = hostdata->clock;
         }
@@ -1263,14 +1253,13 @@ process_script_interrupt(__u32 dsps, __u32 dsp, struct scsi_cmnd *SCp,
                        host->host_no, pun, lun, NCR_700_condition[i],
                        NCR_700_phase[j], dsp - hostdata->pScript);
                 if(SCp != NULL) {
-                        scsi_print_command(SCp);
+                        struct scatterlist *sg;
 
-                        if(SCp->use_sg) {
-                                for(i = 0; i < SCp->use_sg + 1; i++) {
-                                        printk(KERN_INFO " SG[%d].length = %d, move_insn=%08x, addr %08x\n", i, ((struct scatterlist *)SCp->request_buffer)[i].length, ((struct NCR_700_command_slot *)SCp->host_scribble)->SG[i].ins, ((struct NCR_700_command_slot *)SCp->host_scribble)->SG[i].pAddr);
-                                }
+                        scsi_print_command(SCp);
+                        scsi_for_each_sg(SCp, sg, scsi_sg_count(SCp) + 1, i) {
+                                printk(KERN_INFO " SG[%d].length = %d, move_insn=%08x, addr %08x\n", i, sg->length, ((struct NCR_700_command_slot *)SCp->host_scribble)->SG[i].ins, ((struct NCR_700_command_slot *)SCp->host_scribble)->SG[i].pAddr);
                         }
-                }              
+                }
                 NCR_700_internal_bus_reset(host);
         } else if((dsps & 0xfffff000) == A_DEBUG_INTERRUPT) {
                 printk(KERN_NOTICE "scsi%d (%d:%d) DEBUG INTERRUPT %d AT %08x[%04x], continuing\n",
@@ -1844,8 +1833,8 @@ NCR_700_queuecommand(struct scsi_cmnd *SCp, void (*done)(struct scsi_cmnd *))
         }
         /* sanity check: some of the commands generated by the mid-layer
          * have an eccentric idea of their sc_data_direction */
-        if(!SCp->use_sg && !SCp->request_bufflen 
-           && SCp->sc_data_direction != DMA_NONE) {
+        if(!scsi_sg_count(SCp) && !scsi_bufflen(SCp) &&
+           SCp->sc_data_direction != DMA_NONE) {
 #ifdef NCR_700_DEBUG
                 printk("53c700: Command");
                 scsi_print_command(SCp);
@@ -1887,31 +1876,15 @@ NCR_700_queuecommand(struct scsi_cmnd *SCp, void (*done)(struct scsi_cmnd *))
                 int i;
                 int sg_count;
                 dma_addr_t vPtr = 0;
+                struct scatterlist *sg;
                 __u32 count = 0;
 
-                if(SCp->use_sg) {
-                        sg_count = dma_map_sg(hostdata->dev,
-                                              SCp->request_buffer, SCp->use_sg,
-                                              direction);
-                } else {
-                        vPtr = dma_map_single(hostdata->dev,
-                                              SCp->request_buffer, 
-                                              SCp->request_bufflen,
-                                              direction);
-                        count = SCp->request_bufflen;
-                        slot->dma_handle = vPtr;
-                        sg_count = 1;
-                }
-                        
+                sg_count = scsi_dma_map(SCp);
+                BUG_ON(sg_count < 0);
 
-                for(i = 0; i < sg_count; i++) {
-
-                        if(SCp->use_sg) {
-                                struct scatterlist *sg = SCp->request_buffer;
-
-                                vPtr = sg_dma_address(&sg[i]);
-                                count = sg_dma_len(&sg[i]);
-                        }
+                scsi_for_each_sg(SCp, sg, sg_count, i) {
+                        vPtr = sg_dma_address(sg);
+                        count = sg_dma_len(sg);
 
                         slot->SG[i].ins = bS_to_host(move_ins | count);
                         DEBUG((" scatter block %d: move %d[%08x] from 0x%lx\n",