8 files changed, 11 insertions, 12 deletions

diff --git a/drivers/scsi/aic7xxx/aic79xx_core.c b/drivers/scsi/aic7xxx/aic79xx_core.c
index 5f8617dd43bb..25417d0e7acb 100644
--- a/drivers/scsi/aic7xxx/aic79xx_core.c
+++ b/drivers/scsi/aic7xxx/aic79xx_core.c
@@ -8993,7 +8993,7 @@ ahd_handle_scsi_status(struct ahd_softc *ahd, struct scb *scb)
                                         printk("Invalid Command IU Field\n");
                                         break;
                                 case SIU_PFC_TMF_NOT_SUPPORTED:
-                                        printk("TMF not supportd\n");
+                                        printk("TMF not supported\n");
                                         break;
                                 case SIU_PFC_TMF_FAILED:
                                         printk("TMF failed\n");
@@ -9113,7 +9113,7 @@ ahd_handle_scsi_status(struct ahd_softc *ahd, struct scb *scb)
                 break;
         }
         case SCSI_STATUS_OK:
-                printk("%s: Interrupted for staus of 0???\n",
+                printk("%s: Interrupted for status of 0???\n",
                        ahd_name(ahd));
                 /* FALLTHROUGH */
         default:
diff --git a/drivers/scsi/aic7xxx/aic7xxx_core.c b/drivers/scsi/aic7xxx/aic7xxx_core.c
index dc28b0a91b22..10172a3af1b9 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_core.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_core.c
@@ -1049,7 +1049,7 @@ ahc_handle_seqint(struct ahc_softc *ahc, u_int intstat)
                 ahc_set_scsi_status(scb, hscb->shared_data.status.scsi_status);
                 switch (hscb->shared_data.status.scsi_status) {
                 case SCSI_STATUS_OK:
-                        printk("%s: Interrupted for staus of 0???\n",
+                        printk("%s: Interrupted for status of 0???\n",
                                ahc_name(ahc));
                         break;
                 case SCSI_STATUS_CMD_TERMINATED:
diff --git a/drivers/scsi/isci/host.c b/drivers/scsi/isci/host.c
index 418391b1c361..6ca9b26bb2fb 100644
--- a/drivers/scsi/isci/host.c
+++ b/drivers/scsi/isci/host.c
@@ -58,7 +58,6 @@
 #include "host.h"
 #include "isci.h"
 #include "port.h"
-#include "host.h"
 #include "probe_roms.h"
 #include "remote_device.h"
 #include "request.h"
diff --git a/drivers/scsi/mpt2sas/mpt2sas_config.c b/drivers/scsi/mpt2sas/mpt2sas_config.c
index 36ea0b2d8020..2b4d37613d32 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_config.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_config.c
@@ -149,7 +149,7 @@ _config_display_some_debug(struct MPT2SAS_ADAPTER *ioc, u16 smid,
                         desc = "raid_config";
                         break;
                 case MPI2_CONFIG_EXTPAGETYPE_DRIVER_MAPPING:
-                        desc = "driver_mappping";
+                        desc = "driver_mapping";
                         break;
                 }
                 break;
diff --git a/drivers/scsi/pm8001/pm8001_hwi.c b/drivers/scsi/pm8001/pm8001_hwi.c
index b7b92f7be2aa..e12c4f632a63 100644
--- a/drivers/scsi/pm8001/pm8001_hwi.c
+++ b/drivers/scsi/pm8001/pm8001_hwi.c
@@ -3532,7 +3532,7 @@ static void process_one_iomb(struct pm8001_hba_info *pm8001_ha, void *piomb)
                 break;
         case OPC_OUB_DEREG_DEV:
                 PM8001_MSG_DBG(pm8001_ha,
-                        pm8001_printk("unresgister the deviece\n"));
+                        pm8001_printk("unregister the device\n"));
                 mpi_dereg_resp(pm8001_ha, piomb);
                 break;
         case OPC_OUB_GET_DEV_HANDLE:
diff --git a/drivers/scsi/pmcraid.h b/drivers/scsi/pmcraid.h
index ca496c7474e3..e1d150f3fd4d 100644
--- a/drivers/scsi/pmcraid.h
+++ b/drivers/scsi/pmcraid.h
@@ -857,11 +857,11 @@ static struct pmcraid_ioasc_error pmcraid_ioasc_error_table[] = {
         {0x01180600, IOASC_LOG_LEVEL_HARD,
          "Recovered Error, soft media error, sector reassignment suggested"},
         {0x015D0000, IOASC_LOG_LEVEL_HARD,
-         "Recovered Error, failure prediction thresold exceeded"},
+         "Recovered Error, failure prediction threshold exceeded"},
         {0x015D9200, IOASC_LOG_LEVEL_HARD,
-         "Recovered Error, soft Cache Card Battery error thresold"},
+         "Recovered Error, soft Cache Card Battery error threshold"},
         {0x015D9200, IOASC_LOG_LEVEL_HARD,
-         "Recovered Error, soft Cache Card Battery error thresold"},
+         "Recovered Error, soft Cache Card Battery error threshold"},
         {0x02048000, IOASC_LOG_LEVEL_HARD,
          "Not Ready, IOA Reset Required"},
         {0x02408500, IOASC_LOG_LEVEL_HARD,
diff --git a/drivers/scsi/qla2xxx/qla_bsg.c b/drivers/scsi/qla2xxx/qla_bsg.c
index 1682e2e4201d..2c4714279bcc 100644
--- a/drivers/scsi/qla2xxx/qla_bsg.c
+++ b/drivers/scsi/qla2xxx/qla_bsg.c
@@ -731,7 +731,7 @@ qla2x00_process_loopback(struct fc_bsg_job *bsg_job)
 
                         if (elreq.options != EXTERNAL_LOOPBACK) {
                                 ql_dbg(ql_dbg_user, vha, 0x7020,
-                                    "Internal: curent port config = %x\n",
+                                    "Internal: current port config = %x\n",
                                     config[0]);
                                 if (qla81xx_set_internal_loopback(vha, config,
                                         new_config)) {
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index ce6d3b7f0c61..edf503437e96 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -3382,7 +3382,7 @@ static int get_fw_boot_info(struct scsi_qla_host *ha, uint16_t ddb_index[])
                 if (qla4xxx_get_flash(ha, buf_dma, addr,
                                       13 * sizeof(uint8_t)) != QLA_SUCCESS) {
                         DEBUG2(ql4_printk(KERN_ERR, ha, "scsi%ld: %s: Get Flash"
-                                          "failed\n", ha->host_no, __func__));
+                                          " failed\n", ha->host_no, __func__));
                         ret = QLA_ERROR;
                         goto exit_boot_info_free;
                 }
@@ -3620,7 +3620,7 @@ static int qla4xxx_setup_boot_info(struct scsi_qla_host *ha)
 
         if (ql4xdisablesysfsboot) {
                 ql4_printk(KERN_INFO, ha,
-                           "%s: syfsboot disabled - driver will trigger login"
+                           "%s: syfsboot disabled - driver will trigger login "
                            "and publish session for discovery .\n", __func__);
                 return QLA_SUCCESS;
         }