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, 11 insertions, 9 deletions

diff --git a/drivers/scsi/wd7000.c b/drivers/scsi/wd7000.c
index 30be76514c43..d6fd4259c56b 100644
--- a/drivers/scsi/wd7000.c
+++ b/drivers/scsi/wd7000.c
@@ -1091,6 +1091,7 @@ static int wd7000_queuecommand(struct scsi_cmnd *SCpnt,
         unchar *cdb = (unchar *) SCpnt->cmnd;
         unchar idlun;
         short cdblen;
+        int nseg;
         Adapter *host = (Adapter *) SCpnt->device->host->hostdata;
 
         cdblen = SCpnt->cmd_len;
@@ -1106,28 +1107,29 @@ static int wd7000_queuecommand(struct scsi_cmnd *SCpnt,
         SCpnt->host_scribble = (unchar *) scb;
         scb->host = host;
 
-        if (SCpnt->use_sg) {
-                struct scatterlist *sg = (struct scatterlist *) SCpnt->request_buffer;
+        nseg = scsi_sg_count(SCpnt);
+        if (nseg) {
+                struct scatterlist *sg;
                 unsigned i;
 
                 if (SCpnt->device->host->sg_tablesize == SG_NONE) {
                         panic("wd7000_queuecommand: scatter/gather not supported.\n");
                 }
-                dprintk("Using scatter/gather with %d elements.\n", SCpnt->use_sg);
+                dprintk("Using scatter/gather with %d elements.\n", nseg);
 
                 sgb = scb->sgb;
                 scb->op = 1;
                 any2scsi(scb->dataptr, (int) sgb);
-                any2scsi(scb->maxlen, SCpnt->use_sg * sizeof(Sgb));
+                any2scsi(scb->maxlen, nseg * sizeof(Sgb));
 
-                for (i = 0; i < SCpnt->use_sg; i++) {
-                        any2scsi(sgb[i].ptr, isa_page_to_bus(sg[i].page) + sg[i].offset);
-                        any2scsi(sgb[i].len, sg[i].length);
+                scsi_for_each_sg(SCpnt, sg, nseg, i) {
+                        any2scsi(sgb[i].ptr, isa_page_to_bus(sg->page) + sg->offset);
+                        any2scsi(sgb[i].len, sg->length);
                 }
         } else {
                 scb->op = 0;
-                any2scsi(scb->dataptr, isa_virt_to_bus(SCpnt->request_buffer));
-                any2scsi(scb->maxlen, SCpnt->request_bufflen);
+                any2scsi(scb->dataptr, isa_virt_to_bus(scsi_sglist(SCpnt)));
+                any2scsi(scb->maxlen, scsi_bufflen(SCpnt));
         }
 
         /* FIXME: drop lock and yield here ? */