Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (166 commits)
  [SCSI] ibmvscsi: convert to use the data buffer accessors
  [SCSI] dc395x: convert to use the data buffer accessors
  [SCSI] ncr53c8xx: convert to use the data buffer accessors
  [SCSI] sym53c8xx: convert to use the data buffer accessors
  [SCSI] ppa: coding police and printk levels
  [SCSI] aic7xxx_old: remove redundant GFP_ATOMIC from kmalloc
  [SCSI] i2o: remove redundant GFP_ATOMIC from kmalloc from device.c
  [SCSI] remove the dead CYBERSTORMIII_SCSI option
  [SCSI] don't build scsi_dma_{map,unmap} for !HAS_DMA
  [SCSI] Clean up scsi_add_lun a bit
  [SCSI] 53c700: Remove printk, which triggers because of low scsi clock on SNI RMs
  [SCSI] sni_53c710: Cleanup
  [SCSI] qla4xxx: Fix underrun/overrun conditions
  [SCSI] megaraid_mbox: use mutex instead of semaphore
  [SCSI] aacraid: add 51245, 51645 and 52245 adapters to documentation.
  [SCSI] qla2xxx: update version to 8.02.00-k1.
  [SCSI] qla2xxx: add support for NPIV
  [SCSI] stex: use resid for xfer len information
  [SCSI] Add Brownie 1200U3P to blacklist
  [SCSI] scsi.c: convert to use the data buffer accessors
  ...

1 files changed, 18 insertions, 27 deletions

diff --git a/drivers/scsi/NCR53c406a.c b/drivers/scsi/NCR53c406a.c
index 7c0b17f86903..eda8c48f6be7 100644
--- a/drivers/scsi/NCR53c406a.c
+++ b/drivers/scsi/NCR53c406a.c
@@ -698,7 +698,7 @@ static int NCR53c406a_queue(Scsi_Cmnd * SCpnt, void (*done) (Scsi_Cmnd *))
         int i;
 
         VDEB(printk("NCR53c406a_queue called\n"));
-        DEB(printk("cmd=%02x, cmd_len=%02x, target=%02x, lun=%02x, bufflen=%d\n", SCpnt->cmnd[0], SCpnt->cmd_len, SCpnt->target, SCpnt->lun, SCpnt->request_bufflen));
+        DEB(printk("cmd=%02x, cmd_len=%02x, target=%02x, lun=%02x, bufflen=%d\n", SCpnt->cmnd[0], SCpnt->cmd_len, SCpnt->target, SCpnt->lun, scsi_bufflen(SCpnt)));
 
 #if 0
         VDEB(for (i = 0; i < SCpnt->cmd_len; i++)
@@ -785,8 +785,8 @@ static void NCR53c406a_intr(void *dev_id)
         unsigned char status, int_reg;
 #if USE_PIO
         unsigned char pio_status;
-        struct scatterlist *sglist;
-        unsigned int sgcount;
+        struct scatterlist *sg;
+        int i;
 #endif
 
         VDEB(printk("NCR53c406a_intr called\n"));
@@ -866,22 +866,18 @@ static void NCR53c406a_intr(void *dev_id)
                         current_SC->SCp.phase = data_out;
                         VDEB(printk("NCR53c406a: Data-Out phase\n"));
                         outb(FLUSH_FIFO, CMD_REG);
-                        LOAD_DMA_COUNT(current_SC->request_bufflen);    /* Max transfer size */
+                        LOAD_DMA_COUNT(scsi_bufflen(current_SC));       /* Max transfer size */
 #if USE_DMA                     /* No s/g support for DMA */
-                        NCR53c406a_dma_write(current_SC->request_buffer, current_SC->request_bufflen);
+                        NCR53c406a_dma_write(scsi_sglist(current_SC),
+                                             scsdi_bufflen(current_SC));
+
 #endif                          /* USE_DMA */
                         outb(TRANSFER_INFO | DMA_OP, CMD_REG);
 #if USE_PIO
-                        if (!current_SC->use_sg)        /* Don't use scatter-gather */
-                                NCR53c406a_pio_write(current_SC->request_buffer, current_SC->request_bufflen);
-                        else {  /* use scatter-gather */
-                                sgcount = current_SC->use_sg;
-                                sglist = current_SC->request_buffer;
-                                while (sgcount--) {
-                                        NCR53c406a_pio_write(page_address(sglist->page) + sglist->offset, sglist->length);
-                                        sglist++;
-                                }
-                        }
+                        scsi_for_each_sg(current_SC, sg, scsi_sg_count(current_SC), i) {
+                                NCR53c406a_pio_write(page_address(sg->page) + sg->offset,
+                                                     sg->length);
+                        }
                         REG0;
 #endif                          /* USE_PIO */
                 }
@@ -893,22 +889,17 @@ static void NCR53c406a_intr(void *dev_id)
                         current_SC->SCp.phase = data_in;
                         VDEB(printk("NCR53c406a: Data-In phase\n"));
                         outb(FLUSH_FIFO, CMD_REG);
-                        LOAD_DMA_COUNT(current_SC->request_bufflen);    /* Max transfer size */
+                        LOAD_DMA_COUNT(scsi_bufflen(current_SC));       /* Max transfer size */
 #if USE_DMA                     /* No s/g support for DMA */
-                        NCR53c406a_dma_read(current_SC->request_buffer, current_SC->request_bufflen);
+                        NCR53c406a_dma_read(scsi_sglist(current_SC),
+                                            scsdi_bufflen(current_SC));
 #endif                          /* USE_DMA */
                         outb(TRANSFER_INFO | DMA_OP, CMD_REG);
 #if USE_PIO
-                        if (!current_SC->use_sg)        /* Don't use scatter-gather */
-                                NCR53c406a_pio_read(current_SC->request_buffer, current_SC->request_bufflen);
-                        else {  /* Use scatter-gather */
-                                sgcount = current_SC->use_sg;
-                                sglist = current_SC->request_buffer;
-                                while (sgcount--) {
-                                        NCR53c406a_pio_read(page_address(sglist->page) + sglist->offset, sglist->length);
-                                        sglist++;
-                                }
-                        }
+                        scsi_for_each_sg(current_SC, sg, scsi_sg_count(current_SC), i) {
+                                NCR53c406a_pio_read(page_address(sg->page) + sg->offset,
+                                                    sg->length);
+                        }
                         REG0;
 #endif                          /* USE_PIO */
                 }