2 files changed, 18 insertions, 60 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;
         }
diff --git a/drivers/usb/storage/transport.c b/drivers/usb/storage/transport.c
index 323293a3e61f..c646750ccc30 100644
--- a/drivers/usb/storage/transport.c
+++ b/drivers/usb/storage/transport.c
@@ -50,7 +50,7 @@
 #include <linux/slab.h>
 
 #include <scsi/scsi.h>
-#include <scsi/scsi_cmnd.h>
+#include <scsi/scsi_eh.h>
 #include <scsi/scsi_device.h>
 
 #include "usb.h"
@@ -580,25 +580,11 @@ void usb_stor_invoke_transport(struct scsi_cmnd *srb, struct us_data *us)
         /* Now, if we need to do the auto-sense, let's do it */
         if (need_auto_sense) {
                 int temp_result;
-                void* old_request_buffer;
-                unsigned short old_sg;
-                unsigned old_request_bufflen;
-                unsigned char old_sc_data_direction;
-                unsigned char old_cmd_len;
-                unsigned char old_cmnd[MAX_COMMAND_SIZE];
-                int old_resid;
+                struct scsi_eh_save ses;
 
                 US_DEBUGP("Issuing auto-REQUEST_SENSE\n");
 
-                /* save the old command */
-                memcpy(old_cmnd, srb->cmnd, MAX_COMMAND_SIZE);
-                old_cmd_len = srb->cmd_len;
-
-                /* set the command and the LUN */
-                memset(srb->cmnd, 0, MAX_COMMAND_SIZE);
-                srb->cmnd[0] = REQUEST_SENSE;
-                srb->cmnd[1] = old_cmnd[1] & 0xE0;
-                srb->cmnd[4] = 18;
+                scsi_eh_prep_cmnd(srb, &ses, NULL, 0, US_SENSE_SIZE);
 
                 /* FIXME: we must do the protocol translation here */
                 if (us->subclass == US_SC_RBC || us->subclass == US_SC_SCSI)
@@ -606,36 +592,12 @@ void usb_stor_invoke_transport(struct scsi_cmnd *srb, struct us_data *us)
                 else
                         srb->cmd_len = 12;
 
-                /* set the transfer direction */
-                old_sc_data_direction = srb->sc_data_direction;
-                srb->sc_data_direction = DMA_FROM_DEVICE;
-
-                /* use the new buffer we have */
-                old_request_buffer = srb->request_buffer;
-                srb->request_buffer = us->sensebuf;
-
-                /* set the buffer length for transfer */
-                old_request_bufflen = srb->request_bufflen;
-                srb->request_bufflen = US_SENSE_SIZE;
-
-                /* set up for no scatter-gather use */
-                old_sg = srb->use_sg;
-                srb->use_sg = 0;
-
                 /* issue the auto-sense command */
-                old_resid = srb->resid;
                 srb->resid = 0;
                 temp_result = us->transport(us->srb, us);
 
                 /* let's clean up right away */
-                memcpy(srb->sense_buffer, us->sensebuf, US_SENSE_SIZE);
-                srb->resid = old_resid;
-                srb->request_buffer = old_request_buffer;
-                srb->request_bufflen = old_request_bufflen;
-                srb->use_sg = old_sg;
-                srb->sc_data_direction = old_sc_data_direction;
-                srb->cmd_len = old_cmd_len;
-                memcpy(srb->cmnd, old_cmnd, MAX_COMMAND_SIZE);
+                scsi_eh_restore_cmnd(srb, &ses);
 
                 if (test_bit(US_FLIDX_TIMED_OUT, &us->flags)) {
                         US_DEBUGP("-- auto-sense aborted\n");