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

Conflicts:
	litmus/sched_cedf.c

1 files changed, 7 insertions, 6 deletions

diff --git a/drivers/scsi/nsp32.c b/drivers/scsi/nsp32.c
index 4c1e54545200..f6a50c98c36f 100644
--- a/drivers/scsi/nsp32.c
+++ b/drivers/scsi/nsp32.c
@@ -196,8 +196,7 @@ static void __exit    exit_nsp32  (void);
 static int         nsp32_proc_info   (struct Scsi_Host *, char *, char **, off_t, int, int);
 
 static int         nsp32_detect      (struct pci_dev *pdev);
-static int         nsp32_queuecommand(struct scsi_cmnd *,
-                void (*done)(struct scsi_cmnd *));
+static int         nsp32_queuecommand(struct Scsi_Host *, struct scsi_cmnd *);
 static const char *nsp32_info        (struct Scsi_Host *);
 static int         nsp32_release     (struct Scsi_Host *);
 
@@ -909,7 +908,7 @@ static int nsp32_setup_sg_table(struct scsi_cmnd *SCpnt)
         return TRUE;
 }
 
-static int nsp32_queuecommand(struct scsi_cmnd *SCpnt, void (*done)(struct scsi_cmnd *))
+static int nsp32_queuecommand_lck(struct scsi_cmnd *SCpnt, void (*done)(struct scsi_cmnd *))
 {
         nsp32_hw_data *data = (nsp32_hw_data *)SCpnt->device->host->hostdata;
         nsp32_target *target;
@@ -1050,6 +1049,8 @@ static int nsp32_queuecommand(struct scsi_cmnd *SCpnt, void (*done)(struct scsi_
         return 0;
 }
 
+static DEF_SCSI_QCMD(nsp32_queuecommand)
+
 /* initialize asic */
 static int nsp32hw_init(nsp32_hw_data *data)
 {
@@ -1287,7 +1288,7 @@ static irqreturn_t do_nsp32_isr(int irq, void *dev_id)
                         nsp32_dbg(NSP32_DEBUG_INTR, "SSACK=0x%lx", 
                                     nsp32_read4(base, SAVED_SACK_CNT));
 
-                        scsi_set_resid(SCpnt, 0); /* all data transfered! */
+                        scsi_set_resid(SCpnt, 0); /* all data transferred! */
                 }
 
                 /*
@@ -1629,7 +1630,7 @@ static int nsp32_busfree_occur(struct scsi_cmnd *SCpnt, unsigned short execph)
 
                         /*
                          * If SAVEDSACKCNT == 0, it means SavedDataPointer is
-                         * come after data transfering.
+                         * come after data transferring.
                          */
                         if (s_sacklen > 0) {
                                 /*
@@ -1784,7 +1785,7 @@ static void nsp32_adjust_busfree(struct scsi_cmnd *SCpnt, unsigned int s_sacklen
                    the head element of the sg. restlen is correctly calculated. */
         }
 
-        /* calculate the rest length for transfering */
+        /* calculate the rest length for transferring */
         restlen = sentlen - s_sacklen;
 
         /* update adjusting current SG table entry */