Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 8 insertions, 15 deletions

diff --git a/drivers/usb/image/microtek.c b/drivers/usb/image/microtek.c
index 3a6bcd5fee09..a0037961e5bd 100644
--- a/drivers/usb/image/microtek.c
+++ b/drivers/usb/image/microtek.c
@@ -69,7 +69,7 @@
  *      20000513 added IDs for all products supported by Windows driver (john)
  *      20000514 Rewrote mts_scsi_queuecommand to use URBs (john)
  *      20000514 Version 0.0.8j
- *      20000514 Fix reporting of non-existant devices to SCSI layer (john)
+ *      20000514 Fix reporting of non-existent devices to SCSI layer (john)
  *      20000514 Added MTS_DEBUG_INT (john)
  *      20000514 Changed "usb-microtek" to "microtek" for consistency (john)
  *      20000514 Stupid bug fixes (john)
@@ -364,7 +364,7 @@ static int mts_scsi_host_reset(struct scsi_cmnd *srb)
 }
 
 static int
-mts_scsi_queuecommand(struct scsi_cmnd *srb, mts_scsi_cmnd_callback callback);
+mts_scsi_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *srb);
 
 static void mts_transfer_cleanup( struct urb *transfer );
 static void mts_do_sg(struct urb * transfer);
@@ -398,7 +398,6 @@ void mts_int_submit_urb (struct urb* transfer,
                 context->srb->result = DID_ERROR << 16;
                 mts_transfer_cleanup(transfer);
         }
-        return;
 }
 
 
@@ -409,7 +408,6 @@ static void mts_transfer_cleanup( struct urb *transfer )
 
         if ( likely(context->final_callback != NULL) )
                 context->final_callback(context->srb);
-
 }
 
 static void mts_transfer_done( struct urb *transfer )
@@ -420,8 +418,6 @@ static void mts_transfer_done( struct urb *transfer )
         context->srb->result |= (unsigned)(*context->scsi_status)<<1;
 
         mts_transfer_cleanup(transfer);
-
-        return;
 }
 
 
@@ -452,8 +448,6 @@ static void mts_data_done( struct urb* transfer )
         }
 
         mts_get_status(transfer);
-
-        return;
 }
 
 
@@ -496,8 +490,6 @@ static void mts_command_done( struct urb *transfer )
                         mts_get_status(transfer);
                 }
         }
-
-        return;
 }
 
 static void mts_do_sg (struct urb* transfer)
@@ -522,7 +514,6 @@ static void mts_do_sg (struct urb* transfer)
                            sg[context->fragment].length,
                            context->fragment + 1 == scsi_sg_count(context->srb) ?
                            mts_data_done : mts_do_sg);
-        return;
 }
 
 static const u8 mts_read_image_sig[] = { 0x28, 00, 00, 00 };
@@ -566,14 +557,14 @@ mts_build_transfer_context(struct scsi_cmnd *srb, struct mts_desc* desc)
 
         if ( !memcmp( srb->cmnd, mts_read_image_sig, mts_read_image_sig_len )
 ) {             pipe = usb_rcvbulkpipe(desc->usb_dev,desc->ep_image);
-                MTS_DEBUG( "transfering from desc->ep_image == %d\n",
+                MTS_DEBUG( "transferring from desc->ep_image == %d\n",
                            (int)desc->ep_image );
         } else if ( MTS_DIRECTION_IS_IN(srb->cmnd[0]) ) {
                         pipe = usb_rcvbulkpipe(desc->usb_dev,desc->ep_response);
-                        MTS_DEBUG( "transfering from desc->ep_response == %d\n",
+                        MTS_DEBUG( "transferring from desc->ep_response == %d\n",
                                    (int)desc->ep_response);
         } else {
-                MTS_DEBUG("transfering to desc->ep_out == %d\n",
+                MTS_DEBUG("transferring to desc->ep_out == %d\n",
                           (int)desc->ep_out);
                 pipe = usb_sndbulkpipe(desc->usb_dev,desc->ep_out);
         }
@@ -582,7 +573,7 @@ mts_build_transfer_context(struct scsi_cmnd *srb, struct mts_desc* desc)
 
 
 static int
-mts_scsi_queuecommand(struct scsi_cmnd *srb, mts_scsi_cmnd_callback callback)
+mts_scsi_queuecommand_lck(struct scsi_cmnd *srb, mts_scsi_cmnd_callback callback)
 {
         struct mts_desc* desc = (struct mts_desc*)(srb->device->host->hostdata[0]);
         int err = 0;
@@ -635,6 +626,8 @@ out:
         return err;
 }
 
+static DEF_SCSI_QCMD(mts_scsi_queuecommand)
+
 static struct scsi_host_template mts_scsi_host_template = {
         .module                 = THIS_MODULE,
         .name                   = "microtekX6",