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, 19 insertions, 23 deletions

diff --git a/drivers/scsi/pcmcia/sym53c500_cs.c b/drivers/scsi/pcmcia/sym53c500_cs.c
index ffe75c431b25..2695b7187b2f 100644
--- a/drivers/scsi/pcmcia/sym53c500_cs.c
+++ b/drivers/scsi/pcmcia/sym53c500_cs.c
@@ -370,8 +370,6 @@ SYM53C500_intr(int irq, void *dev_id)
         DEB(unsigned char seq_reg;)
         unsigned char status, int_reg;
         unsigned char pio_status;
-        struct scatterlist *sglist;
-        unsigned int sgcount;
         int port_base = dev->io_port;
         struct sym53c500_data *data =
             (struct sym53c500_data *)dev->hostdata;
@@ -434,20 +432,19 @@ SYM53C500_intr(int irq, void *dev_id)
         switch (status & 0x07) {        /* scsi phase */
         case 0x00:                      /* DATA-OUT */
                 if (int_reg & 0x10) {   /* Target requesting info transfer */
+                        struct scatterlist *sg;
+                        int i;
+
                         curSC->SCp.phase = data_out;
                         VDEB(printk("SYM53C500: Data-Out phase\n"));
                         outb(FLUSH_FIFO, port_base + CMD_REG);
-                        LOAD_DMA_COUNT(port_base, curSC->request_bufflen);      /* Max transfer size */
+                        LOAD_DMA_COUNT(port_base, scsi_bufflen(curSC)); /* Max transfer size */
                         outb(TRANSFER_INFO | DMA_OP, port_base + CMD_REG);
-                        if (!curSC->use_sg)     /* Don't use scatter-gather */
-                                SYM53C500_pio_write(fast_pio, port_base, curSC->request_buffer, curSC->request_bufflen);
-                        else {  /* use scatter-gather */
-                                sgcount = curSC->use_sg;
-                                sglist = curSC->request_buffer;
-                                while (sgcount--) {
-                                        SYM53C500_pio_write(fast_pio, port_base, page_address(sglist->page) + sglist->offset, sglist->length);
-                                        sglist++;
-                                }
+
+                        scsi_for_each_sg(curSC, sg, scsi_sg_count(curSC), i) {
+                                SYM53C500_pio_write(fast_pio, port_base,
+                                                    page_address(sg->page) + sg->offset,
+                                                    sg->length);
                         }
                         REG0(port_base);
                 }
@@ -455,20 +452,19 @@ SYM53C500_intr(int irq, void *dev_id)
 
         case 0x01:              /* DATA-IN */
                 if (int_reg & 0x10) {   /* Target requesting info transfer */
+                        struct scatterlist *sg;
+                        int i;
+
                         curSC->SCp.phase = data_in;
                         VDEB(printk("SYM53C500: Data-In phase\n"));
                         outb(FLUSH_FIFO, port_base + CMD_REG);
-                        LOAD_DMA_COUNT(port_base, curSC->request_bufflen);      /* Max transfer size */
+                        LOAD_DMA_COUNT(port_base, scsi_bufflen(curSC)); /* Max transfer size */
                         outb(TRANSFER_INFO | DMA_OP, port_base + CMD_REG);
-                        if (!curSC->use_sg)     /* Don't use scatter-gather */
-                                SYM53C500_pio_read(fast_pio, port_base, curSC->request_buffer, curSC->request_bufflen);
-                        else {  /* Use scatter-gather */
-                                sgcount = curSC->use_sg;
-                                sglist = curSC->request_buffer;
-                                while (sgcount--) {
-                                        SYM53C500_pio_read(fast_pio, port_base, page_address(sglist->page) + sglist->offset, sglist->length);
-                                        sglist++;
-                                }
+
+                        scsi_for_each_sg(curSC, sg, scsi_sg_count(curSC), i) {
+                                SYM53C500_pio_read(fast_pio, port_base,
+                                                   page_address(sg->page) + sg->offset,
+                                                   sg->length);
                         }
                         REG0(port_base);
                 }
@@ -578,7 +574,7 @@ SYM53C500_queue(struct scsi_cmnd *SCpnt, void (*done)(struct scsi_cmnd *))
 
         DEB(printk("cmd=%02x, cmd_len=%02x, target=%02x, lun=%02x, bufflen=%d\n", 
             SCpnt->cmnd[0], SCpnt->cmd_len, SCpnt->device->id, 
-            SCpnt->device->lun,  SCpnt->request_bufflen));
+            SCpnt->device->lun,  scsi_bufflen(SCpnt)));
 
         VDEB(for (i = 0; i < SCpnt->cmd_len; i++)
             printk("cmd[%d]=%02x  ", i, SCpnt->cmnd[i]));