aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/scsi/NCR53C9x.h2
-rw-r--r--drivers/scsi/aic7xxx/aic79xx_inline.h2
-rw-r--r--drivers/scsi/aic7xxx/aic79xx_osm.c2
-rw-r--r--drivers/scsi/aic7xxx/aic79xx_pci.c4
-rw-r--r--drivers/scsi/aic7xxx/aic7xxx_inline.h2
-rw-r--r--drivers/scsi/aic7xxx/aic7xxx_osm.c2
-rw-r--r--drivers/scsi/ipr.c2
-rw-r--r--drivers/scsi/ips.c2
-rw-r--r--drivers/scsi/lpfc/lpfc.h2
-rw-r--r--drivers/scsi/lpfc/lpfc_mbox.c2
-rw-r--r--drivers/scsi/megaraid/megaraid_mbox.c10
-rw-r--r--drivers/scsi/qla2xxx/qla_gs.c2
-rw-r--r--drivers/scsi/qla4xxx/ql4_def.h2
-rw-r--r--drivers/scsi/qla4xxx/ql4_init.c2
-rw-r--r--drivers/scsi/scsi_tgt_lib.c2
-rw-r--r--drivers/scsi/scsi_transport_sas.c2
16 files changed, 21 insertions, 21 deletions
diff --git a/drivers/scsi/NCR53C9x.h b/drivers/scsi/NCR53C9x.h
index d85cb73a9f69..00a0ba040dba 100644
--- a/drivers/scsi/NCR53C9x.h
+++ b/drivers/scsi/NCR53C9x.h
@@ -1,6 +1,6 @@
1/* NCR53C9x.c: Defines and structures for the NCR53C9x generic driver. 1/* NCR53C9x.c: Defines and structures for the NCR53C9x generic driver.
2 * 2 *
3 * Originaly esp.h: Defines and structures for the Sparc ESP 3 * Originally esp.h: Defines and structures for the Sparc ESP
4 * (Enhanced SCSI Processor) driver under Linux. 4 * (Enhanced SCSI Processor) driver under Linux.
5 * 5 *
6 * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) 6 * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
diff --git a/drivers/scsi/aic7xxx/aic79xx_inline.h b/drivers/scsi/aic7xxx/aic79xx_inline.h
index 2ceb67f4af2a..45e55575a0fa 100644
--- a/drivers/scsi/aic7xxx/aic79xx_inline.h
+++ b/drivers/scsi/aic7xxx/aic79xx_inline.h
@@ -417,7 +417,7 @@ ahd_targetcmd_offset(struct ahd_softc *ahd, u_int index)
417 - (uint8_t *)ahd->qoutfifo); 417 - (uint8_t *)ahd->qoutfifo);
418} 418}
419 419
420/*********************** Miscelaneous Support Functions ***********************/ 420/*********************** Miscellaneous Support Functions ***********************/
421static __inline struct ahd_initiator_tinfo * 421static __inline struct ahd_initiator_tinfo *
422 ahd_fetch_transinfo(struct ahd_softc *ahd, 422 ahd_fetch_transinfo(struct ahd_softc *ahd,
423 char channel, u_int our_id, 423 char channel, u_int our_id,
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.c b/drivers/scsi/aic7xxx/aic79xx_osm.c
index 014654792901..72fccd9f40df 100644
--- a/drivers/scsi/aic7xxx/aic79xx_osm.c
+++ b/drivers/scsi/aic7xxx/aic79xx_osm.c
@@ -325,7 +325,7 @@ MODULE_PARM_DESC(aic79xx,
325" verbose Enable verbose/diagnostic logging\n" 325" verbose Enable verbose/diagnostic logging\n"
326" allow_memio Allow device registers to be memory mapped\n" 326" allow_memio Allow device registers to be memory mapped\n"
327" debug Bitmask of debug values to enable\n" 327" debug Bitmask of debug values to enable\n"
328" no_reset Supress initial bus resets\n" 328" no_reset Suppress initial bus resets\n"
329" extended Enable extended geometry on all controllers\n" 329" extended Enable extended geometry on all controllers\n"
330" periodic_otag Send an ordered tagged transaction\n" 330" periodic_otag Send an ordered tagged transaction\n"
331" periodically to prevent tag starvation.\n" 331" periodically to prevent tag starvation.\n"
diff --git a/drivers/scsi/aic7xxx/aic79xx_pci.c b/drivers/scsi/aic7xxx/aic79xx_pci.c
index df853676e66a..c9f79fdf9131 100644
--- a/drivers/scsi/aic7xxx/aic79xx_pci.c
+++ b/drivers/scsi/aic7xxx/aic79xx_pci.c
@@ -979,7 +979,7 @@ ahd_aic790X_setup(struct ahd_softc *ahd)
979 | AHD_FAINT_LED_BUG; 979 | AHD_FAINT_LED_BUG;
980 980
981 /* 981 /*
982 * IO Cell paramter setup. 982 * IO Cell parameter setup.
983 */ 983 */
984 AHD_SET_PRECOMP(ahd, AHD_PRECOMP_CUTBACK_29); 984 AHD_SET_PRECOMP(ahd, AHD_PRECOMP_CUTBACK_29);
985 985
@@ -1006,7 +1006,7 @@ ahd_aic790X_setup(struct ahd_softc *ahd)
1006 ahd->bugs |= AHD_INTCOLLISION_BUG|AHD_ABORT_LQI_BUG; 1006 ahd->bugs |= AHD_INTCOLLISION_BUG|AHD_ABORT_LQI_BUG;
1007 1007
1008 /* 1008 /*
1009 * IO Cell paramter setup. 1009 * IO Cell parameter setup.
1010 */ 1010 */
1011 AHD_SET_PRECOMP(ahd, AHD_PRECOMP_CUTBACK_29); 1011 AHD_SET_PRECOMP(ahd, AHD_PRECOMP_CUTBACK_29);
1012 AHD_SET_SLEWRATE(ahd, AHD_SLEWRATE_DEF_REVB); 1012 AHD_SET_SLEWRATE(ahd, AHD_SLEWRATE_DEF_REVB);
diff --git a/drivers/scsi/aic7xxx/aic7xxx_inline.h b/drivers/scsi/aic7xxx/aic7xxx_inline.h
index 8e1954cdd84f..cba2f23bbe79 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_inline.h
+++ b/drivers/scsi/aic7xxx/aic7xxx_inline.h
@@ -229,7 +229,7 @@ ahc_name(struct ahc_softc *ahc)
229 return (ahc->name); 229 return (ahc->name);
230} 230}
231 231
232/*********************** Miscelaneous Support Functions ***********************/ 232/*********************** Miscellaneous Support Functions ***********************/
233 233
234static __inline void ahc_update_residual(struct ahc_softc *ahc, 234static __inline void ahc_update_residual(struct ahc_softc *ahc,
235 struct scb *scb); 235 struct scb *scb);
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c
index 99a3b33a3233..282aff6f852e 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_osm.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm.c
@@ -347,7 +347,7 @@ MODULE_PARM_DESC(aic7xxx,
347" debug Bitmask of debug values to enable\n" 347" debug Bitmask of debug values to enable\n"
348" no_probe Toggle EISA/VLB controller probing\n" 348" no_probe Toggle EISA/VLB controller probing\n"
349" probe_eisa_vl Toggle EISA/VLB controller probing\n" 349" probe_eisa_vl Toggle EISA/VLB controller probing\n"
350" no_reset Supress initial bus resets\n" 350" no_reset Suppress initial bus resets\n"
351" extended Enable extended geometry on all controllers\n" 351" extended Enable extended geometry on all controllers\n"
352" periodic_otag Send an ordered tagged transaction\n" 352" periodic_otag Send an ordered tagged transaction\n"
353" periodically to prevent tag starvation.\n" 353" periodically to prevent tag starvation.\n"
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index 73270ff892d9..2074701f7e76 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -7053,7 +7053,7 @@ static pci_ers_result_t ipr_pci_error_detected(struct pci_dev *pdev,
7053 * where it can accept new commands. 7053 * where it can accept new commands.
7054 7054
7055 * Return value: 7055 * Return value:
7056 * 0 on sucess / -EIO on failure 7056 * 0 on success / -EIO on failure
7057 **/ 7057 **/
7058static int __devinit ipr_probe_ioa_part2(struct ipr_ioa_cfg *ioa_cfg) 7058static int __devinit ipr_probe_ioa_part2(struct ipr_ioa_cfg *ioa_cfg)
7059{ 7059{
diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c
index 7505cca8e68e..bb152fb9fec7 100644
--- a/drivers/scsi/ips.c
+++ b/drivers/scsi/ips.c
@@ -1309,7 +1309,7 @@ ips_intr_copperhead(ips_ha_t * ha)
1309 cstatus.value = (*ha->func.statupd) (ha); 1309 cstatus.value = (*ha->func.statupd) (ha);
1310 1310
1311 if (cstatus.fields.command_id > (IPS_MAX_CMDS - 1)) { 1311 if (cstatus.fields.command_id > (IPS_MAX_CMDS - 1)) {
1312 /* Spurious Interupt ? */ 1312 /* Spurious Interrupt ? */
1313 continue; 1313 continue;
1314 } 1314 }
1315 1315
diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
index f26b9538affe..83567b9755b4 100644
--- a/drivers/scsi/lpfc/lpfc.h
+++ b/drivers/scsi/lpfc/lpfc.h
@@ -325,7 +325,7 @@ struct lpfc_vport {
325 325
326#define WORKER_MBOX_TMO 0x100 /* hba: MBOX timeout */ 326#define WORKER_MBOX_TMO 0x100 /* hba: MBOX timeout */
327#define WORKER_HB_TMO 0x200 /* hba: Heart beat timeout */ 327#define WORKER_HB_TMO 0x200 /* hba: Heart beat timeout */
328#define WORKER_FABRIC_BLOCK_TMO 0x400 /* hba: fabric block timout */ 328#define WORKER_FABRIC_BLOCK_TMO 0x400 /* hba: fabric block timeout */
329#define WORKER_RAMP_DOWN_QUEUE 0x800 /* hba: Decrease Q depth */ 329#define WORKER_RAMP_DOWN_QUEUE 0x800 /* hba: Decrease Q depth */
330#define WORKER_RAMP_UP_QUEUE 0x1000 /* hba: Increase Q depth */ 330#define WORKER_RAMP_UP_QUEUE 0x1000 /* hba: Increase Q depth */
331 331
diff --git a/drivers/scsi/lpfc/lpfc_mbox.c b/drivers/scsi/lpfc/lpfc_mbox.c
index dfc63f6ccd7b..7a9be4c5b7cb 100644
--- a/drivers/scsi/lpfc/lpfc_mbox.c
+++ b/drivers/scsi/lpfc/lpfc_mbox.c
@@ -880,7 +880,7 @@ lpfc_mbox_get(struct lpfc_hba * phba)
880void 880void
881lpfc_mbox_cmpl_put(struct lpfc_hba * phba, LPFC_MBOXQ_t * mbq) 881lpfc_mbox_cmpl_put(struct lpfc_hba * phba, LPFC_MBOXQ_t * mbq)
882{ 882{
883 /* This function expects to be called from interupt context */ 883 /* This function expects to be called from interrupt context */
884 spin_lock(&phba->hbalock); 884 spin_lock(&phba->hbalock);
885 list_add_tail(&mbq->list, &phba->sli.mboxq_cmpl); 885 list_add_tail(&mbq->list, &phba->sli.mboxq_cmpl);
886 spin_unlock(&phba->hbalock); 886 spin_unlock(&phba->hbalock);
diff --git a/drivers/scsi/megaraid/megaraid_mbox.c b/drivers/scsi/megaraid/megaraid_mbox.c
index 6db77c00e3ee..9f041929aca5 100644
--- a/drivers/scsi/megaraid/megaraid_mbox.c
+++ b/drivers/scsi/megaraid/megaraid_mbox.c
@@ -3464,12 +3464,12 @@ megaraid_mbox_setup_device_map(adapter_t *adapter)
3464/* 3464/*
3465 * START: Interface for the common management module 3465 * START: Interface for the common management module
3466 * 3466 *
3467 * This is the module, which interfaces with the common mangement module to 3467 * This is the module, which interfaces with the common management module to
3468 * provide support for ioctl and sysfs 3468 * provide support for ioctl and sysfs
3469 */ 3469 */
3470 3470
3471/** 3471/**
3472 * megaraid_cmm_register - register with the mangement module 3472 * megaraid_cmm_register - register with the management module
3473 * @adapter : HBA soft state 3473 * @adapter : HBA soft state
3474 * 3474 *
3475 * Register with the management module, which allows applications to issue 3475 * Register with the management module, which allows applications to issue
@@ -3557,7 +3557,7 @@ megaraid_cmm_register(adapter_t *adapter)
3557 3557
3558 3558
3559/** 3559/**
3560 * megaraid_cmm_unregister - un-register with the mangement module 3560 * megaraid_cmm_unregister - un-register with the management module
3561 * @adapter : HBA soft state 3561 * @adapter : HBA soft state
3562 * 3562 *
3563 * Un-register with the management module. 3563 * Un-register with the management module.
@@ -3579,7 +3579,7 @@ megaraid_cmm_unregister(adapter_t *adapter)
3579 * @kioc : CMM interface packet 3579 * @kioc : CMM interface packet
3580 * @action : command action 3580 * @action : command action
3581 * 3581 *
3582 * This routine is invoked whenever the Common Mangement Module (CMM) has a 3582 * This routine is invoked whenever the Common Management Module (CMM) has a
3583 * command for us. The 'action' parameter specifies if this is a new command 3583 * command for us. The 'action' parameter specifies if this is a new command
3584 * or otherwise. 3584 * or otherwise.
3585 */ 3585 */
@@ -3944,7 +3944,7 @@ megaraid_sysfs_get_ldmap_timeout(unsigned long data)
3944 * 3944 *
3945 * This routine will be called whenever user reads the logical drive 3945 * This routine will be called whenever user reads the logical drive
3946 * attributes, go get the current logical drive mapping table from the 3946 * attributes, go get the current logical drive mapping table from the
3947 * firmware. We use the managment API's to issue commands to the controller. 3947 * firmware. We use the management API's to issue commands to the controller.
3948 * 3948 *
3949 * NOTE: The commands issuance functionality is not generalized and 3949 * NOTE: The commands issuance functionality is not generalized and
3950 * implemented in context of "get ld map" command only. If required, the 3950 * implemented in context of "get ld map" command only. If required, the
diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c
index eb0784c9ff83..6226d88479f5 100644
--- a/drivers/scsi/qla2xxx/qla_gs.c
+++ b/drivers/scsi/qla2xxx/qla_gs.c
@@ -1094,7 +1094,7 @@ qla2x00_sns_rnn_id(scsi_qla_host_t *ha)
1094} 1094}
1095 1095
1096/** 1096/**
1097 * qla2x00_mgmt_svr_login() - Login to fabric Managment Service. 1097 * qla2x00_mgmt_svr_login() - Login to fabric Management Service.
1098 * @ha: HA context 1098 * @ha: HA context
1099 * 1099 *
1100 * Returns 0 on success. 1100 * Returns 0 on success.
diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
index accaf690eaf0..d6be0762eb91 100644
--- a/drivers/scsi/qla4xxx/ql4_def.h
+++ b/drivers/scsi/qla4xxx/ql4_def.h
@@ -121,7 +121,7 @@
121#define MAX_REQS_SERVICED_PER_INTR 16 121#define MAX_REQS_SERVICED_PER_INTR 16
122 122
123#define ISCSI_IPADDR_SIZE 4 /* IP address size */ 123#define ISCSI_IPADDR_SIZE 4 /* IP address size */
124#define ISCSI_ALIAS_SIZE 32 /* ISCSI Alais name size */ 124#define ISCSI_ALIAS_SIZE 32 /* ISCSI Alias name size */
125#define ISCSI_NAME_SIZE 0xE0 /* ISCSI Name size */ 125#define ISCSI_NAME_SIZE 0xE0 /* ISCSI Name size */
126 126
127#define LSDW(x) ((u32)((u64)(x))) 127#define LSDW(x) ((u32)((u64)(x)))
diff --git a/drivers/scsi/qla4xxx/ql4_init.c b/drivers/scsi/qla4xxx/ql4_init.c
index cbe0a17ced5f..49925f92555e 100644
--- a/drivers/scsi/qla4xxx/ql4_init.c
+++ b/drivers/scsi/qla4xxx/ql4_init.c
@@ -1098,7 +1098,7 @@ static int qla4xxx_start_firmware(struct scsi_qla_host *ha)
1098 } 1098 }
1099 config_chip = 1; 1099 config_chip = 1;
1100 1100
1101 /* Reset clears the semaphore, so aquire again */ 1101 /* Reset clears the semaphore, so acquire again */
1102 if (ql4xxx_lock_drvr_wait(ha) != QLA_SUCCESS) 1102 if (ql4xxx_lock_drvr_wait(ha) != QLA_SUCCESS)
1103 return QLA_ERROR; 1103 return QLA_ERROR;
1104 } 1104 }
diff --git a/drivers/scsi/scsi_tgt_lib.c b/drivers/scsi/scsi_tgt_lib.c
index 91630baea532..3677fbb30b72 100644
--- a/drivers/scsi/scsi_tgt_lib.c
+++ b/drivers/scsi/scsi_tgt_lib.c
@@ -320,7 +320,7 @@ int scsi_tgt_queue_command(struct scsi_cmnd *cmd, u64 itn_id,
320EXPORT_SYMBOL_GPL(scsi_tgt_queue_command); 320EXPORT_SYMBOL_GPL(scsi_tgt_queue_command);
321 321
322/* 322/*
323 * This is run from a interrpt handler normally and the unmap 323 * This is run from a interrupt handler normally and the unmap
324 * needs process context so we must queue 324 * needs process context so we must queue
325 */ 325 */
326static void scsi_tgt_cmd_done(struct scsi_cmnd *cmd) 326static void scsi_tgt_cmd_done(struct scsi_cmnd *cmd)
diff --git a/drivers/scsi/scsi_transport_sas.c b/drivers/scsi/scsi_transport_sas.c
index f2149d0bb999..43a964d635b4 100644
--- a/drivers/scsi/scsi_transport_sas.c
+++ b/drivers/scsi/scsi_transport_sas.c
@@ -6,7 +6,7 @@
6 * 6 *
7 * The SAS transport class contains common code to deal with SAS HBAs, 7 * The SAS transport class contains common code to deal with SAS HBAs,
8 * an aproximated representation of SAS topologies in the driver model, 8 * an aproximated representation of SAS topologies in the driver model,
9 * and various sysfs attributes to expose these topologies and managment 9 * and various sysfs attributes to expose these topologies and management
10 * interfaces to userspace. 10 * interfaces to userspace.
11 * 11 *
12 * In addition to the basic SCSI core objects this transport class 12 * In addition to the basic SCSI core objects this transport class