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: (207 commits)
  [SCSI] gdth: fix CONFIG_ISA build failure
  [SCSI] esp_scsi: remove __dev{init,exit}
  [SCSI] gdth: !use_sg cleanup and use of scsi accessors
  [SCSI] gdth: Move members from SCp to gdth_cmndinfo, stage 2
  [SCSI] gdth: Setup proper per-command private data
  [SCSI] gdth: Remove gdth_ctr_tab[]
  [SCSI] gdth: switch to modern scsi host registration
  [SCSI] gdth: gdth_interrupt() gdth_get_status() & gdth_wait() fixes
  [SCSI] gdth: clean up host private data
  [SCSI] gdth: Remove virt hosts
  [SCSI] gdth: Reorder scsi_host_template intitializers
  [SCSI] gdth: kill gdth_{read,write}[bwl] wrappers
  [SCSI] gdth: Remove 2.4.x support, in-kernel changelog
  [SCSI] gdth: split out pci probing
  [SCSI] gdth: split out eisa probing
  [SCSI] gdth: split out isa probing
  gdth: Make one abuse of scsi_cmnd less obvious
  [SCSI] NCR5380: Use scsi_eh API for REQUEST_SENSE invocation
  [SCSI] usb storage: use scsi_eh API in REQUEST_SENSE execution
  [SCSI] scsi_error: Refactoring scsi_error to facilitate in synchronous REQUEST_SENSE
  ...

1 files changed, 14 insertions, 18 deletions

diff --git a/drivers/usb/image/microtek.c b/drivers/usb/image/microtek.c
index 768b2c11a231..e7d982a71548 100644
--- a/drivers/usb/image/microtek.c
+++ b/drivers/usb/image/microtek.c
@@ -446,7 +446,8 @@ static void mts_data_done( struct urb* transfer )
         MTS_INT_INIT();
 
         if ( context->data_length != transfer->actual_length ) {
-                context->srb->resid = context->data_length - transfer->actual_length;
+                scsi_set_resid(context->srb, context->data_length -
+                               transfer->actual_length);
         } else if ( unlikely(status) ) {
                 context->srb->result = (status == -ENOENT ? DID_ABORT : DID_ERROR)<<16;
         }
@@ -490,7 +491,8 @@ static void mts_command_done( struct urb *transfer )
                                            context->data_pipe,
                                            context->data,
                                            context->data_length,
-                                           context->srb->use_sg > 1 ? mts_do_sg : mts_data_done);
+                                           scsi_sg_count(context->srb) > 1 ?
+                                                   mts_do_sg : mts_data_done);
                 } else {
                         mts_get_status(transfer);
                 }
@@ -505,21 +507,23 @@ static void mts_do_sg (struct urb* transfer)
         int status = transfer->status;
         MTS_INT_INIT();
 
-        MTS_DEBUG("Processing fragment %d of %d\n", context->fragment,context->srb->use_sg);
+        MTS_DEBUG("Processing fragment %d of %d\n", context->fragment,
+                                                  scsi_sg_count(context->srb));
 
         if (unlikely(status)) {
                 context->srb->result = (status == -ENOENT ? DID_ABORT : DID_ERROR)<<16;
                 mts_transfer_cleanup(transfer);
         }
 
-        sg = context->srb->request_buffer;
+        sg = scsi_sglist(context->srb);
         context->fragment++;
         mts_int_submit_urb(transfer,
                            context->data_pipe,
                            page_address(sg[context->fragment].page) +
                            sg[context->fragment].offset,
                            sg[context->fragment].length,
-                           context->fragment + 1 == context->srb->use_sg ? mts_data_done : mts_do_sg);
+                           context->fragment + 1 == scsi_sg_count(context->srb) ?
+                           mts_data_done : mts_do_sg);
         return;
 }
 
@@ -547,20 +551,12 @@ mts_build_transfer_context(struct scsi_cmnd *srb, struct mts_desc* desc)
         desc->context.srb = srb;
         desc->context.fragment = 0;
 
-        if (!srb->use_sg) {
-                if ( !srb->request_bufflen ){
-                        desc->context.data = NULL;
-                        desc->context.data_length = 0;
-                        return;
-                } else {
-                        desc->context.data = srb->request_buffer;
-                        desc->context.data_length = srb->request_bufflen;
-                        MTS_DEBUG("length = %d or %d\n",
-                                  srb->request_bufflen, srb->bufflen);
-                }
+        if (!scsi_bufflen(srb)) {
+                desc->context.data = NULL;
+                desc->context.data_length = 0;
+                return;
         } else {
-                MTS_DEBUG("Using scatter/gather\n");
-                sg = srb->request_buffer;
+                sg = scsi_sglist(srb);
                 desc->context.data = page_address(sg[0].page) + sg[0].offset;
                 desc->context.data_length = sg[0].length;
         }