aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/3w-9xxx.h2
-rw-r--r--drivers/scsi/3w-xxxx.h2
-rw-r--r--drivers/scsi/53c700.scr2
-rw-r--r--drivers/scsi/53c700_d.h_shipped2
-rw-r--r--drivers/scsi/FlashPoint.c4
-rw-r--r--drivers/scsi/NCR5380.c8
-rw-r--r--drivers/scsi/aacraid/aachba.c4
-rw-r--r--drivers/scsi/aacraid/aacraid.h2
-rw-r--r--drivers/scsi/aacraid/commsup.c2
-rw-r--r--drivers/scsi/advansys.c2
-rw-r--r--drivers/scsi/aha1740.c2
-rw-r--r--drivers/scsi/aic7xxx/aic79xx.h4
-rw-r--r--drivers/scsi/aic7xxx/aic79xx.reg24
-rw-r--r--drivers/scsi/aic7xxx/aic79xx.seq18
-rw-r--r--drivers/scsi/aic7xxx/aic79xx_core.c24
-rw-r--r--drivers/scsi/aic7xxx/aic79xx_osm.c2
-rw-r--r--drivers/scsi/aic7xxx/aic7xxx.h4
-rw-r--r--drivers/scsi/aic7xxx/aic7xxx.reg2
-rw-r--r--drivers/scsi/aic7xxx/aic7xxx.seq10
-rw-r--r--drivers/scsi/aic7xxx/aic7xxx_core.c18
-rw-r--r--drivers/scsi/aic7xxx/aic7xxx_osm.c4
-rw-r--r--drivers/scsi/aic7xxx/aic7xxx_pci.c6
-rw-r--r--drivers/scsi/aic7xxx/aicasm/aicasm_gram.y8
-rw-r--r--drivers/scsi/aic7xxx/aicasm/aicasm_macro_gram.y2
-rw-r--r--drivers/scsi/aic7xxx_old.c12
-rw-r--r--drivers/scsi/aic7xxx_old/aic7xxx.seq8
-rw-r--r--drivers/scsi/aic94xx/aic94xx_reg_def.h2
-rw-r--r--drivers/scsi/arm/acornscsi.c4
-rw-r--r--drivers/scsi/arm/acornscsi.h6
-rw-r--r--drivers/scsi/arm/arxescsi.c2
-rw-r--r--drivers/scsi/arm/cumana_2.c2
-rw-r--r--drivers/scsi/arm/eesox.c2
-rw-r--r--drivers/scsi/arm/fas216.c4
-rw-r--r--drivers/scsi/arm/fas216.h10
-rw-r--r--drivers/scsi/arm/powertec.c2
-rw-r--r--drivers/scsi/atari_NCR5380.c6
-rw-r--r--drivers/scsi/atp870u.c2
-rw-r--r--drivers/scsi/be2iscsi/be_cmds.h18
-rw-r--r--drivers/scsi/bfa/bfa_core.c2
-rw-r--r--drivers/scsi/bfa/bfa_defs_svc.h6
-rw-r--r--drivers/scsi/bfa/bfa_fc.h2
-rw-r--r--drivers/scsi/bfa/bfa_fcs.c2
-rw-r--r--drivers/scsi/bfa/bfa_fcs.h2
-rw-r--r--drivers/scsi/bfa/bfa_fcs_lport.c2
-rw-r--r--drivers/scsi/bfa/bfa_svc.c4
-rw-r--r--drivers/scsi/bfa/bfa_svc.h2
-rw-r--r--drivers/scsi/bfa/bfad.c2
-rw-r--r--drivers/scsi/bnx2fc/57xx_hsi_bnx2fc.h2
-rw-r--r--drivers/scsi/bnx2fc/bnx2fc_els.c2
-rw-r--r--drivers/scsi/bnx2fc/bnx2fc_io.c4
-rw-r--r--drivers/scsi/bnx2fc/bnx2fc_tgt.c2
-rw-r--r--drivers/scsi/bnx2i/bnx2i_hwi.c2
-rw-r--r--drivers/scsi/cxgbi/libcxgbi.h6
-rw-r--r--drivers/scsi/dc395x.c14
-rw-r--r--drivers/scsi/dc395x.h2
-rw-r--r--drivers/scsi/device_handler/scsi_dh_alua.c4
-rw-r--r--drivers/scsi/dpt/sys_info.h6
-rw-r--r--drivers/scsi/eata.c2
-rw-r--r--drivers/scsi/fcoe/fcoe_ctlr.c4
-rw-r--r--drivers/scsi/fdomain.c2
-rw-r--r--drivers/scsi/fnic/fnic_fcs.c2
-rw-r--r--drivers/scsi/fnic/fnic_scsi.c4
-rw-r--r--drivers/scsi/g_NCR5380.c4
-rw-r--r--drivers/scsi/gdth.h2
-rw-r--r--drivers/scsi/gvp11.c2
-rw-r--r--drivers/scsi/imm.c2
-rw-r--r--drivers/scsi/initio.c4
-rw-r--r--drivers/scsi/initio.h4
-rw-r--r--drivers/scsi/ips.c4
-rw-r--r--drivers/scsi/ips.h2
-rw-r--r--drivers/scsi/iscsi_tcp.c2
-rw-r--r--drivers/scsi/libfc/fc_exch.c4
-rw-r--r--drivers/scsi/libfc/fc_fcp.c4
-rw-r--r--drivers/scsi/libfc/fc_lport.c18
-rw-r--r--drivers/scsi/libsas/sas_expander.c2
-rw-r--r--drivers/scsi/lpfc/lpfc_attr.c2
-rw-r--r--drivers/scsi/lpfc/lpfc_bsg.c2
-rw-r--r--drivers/scsi/lpfc/lpfc_debugfs.c8
-rw-r--r--drivers/scsi/lpfc/lpfc_els.c4
-rw-r--r--drivers/scsi/lpfc/lpfc_hbadisc.c16
-rw-r--r--drivers/scsi/lpfc/lpfc_init.c20
-rw-r--r--drivers/scsi/lpfc/lpfc_mbox.c2
-rw-r--r--drivers/scsi/lpfc/lpfc_nl.h2
-rw-r--r--drivers/scsi/lpfc/lpfc_nportdisc.c2
-rw-r--r--drivers/scsi/lpfc/lpfc_scsi.c10
-rw-r--r--drivers/scsi/lpfc/lpfc_scsi.h2
-rw-r--r--drivers/scsi/lpfc/lpfc_sli.c26
-rw-r--r--drivers/scsi/megaraid.c4
-rw-r--r--drivers/scsi/megaraid.h6
-rw-r--r--drivers/scsi/megaraid/mbox_defs.h8
-rw-r--r--drivers/scsi/megaraid/megaraid_mbox.c6
-rw-r--r--drivers/scsi/megaraid/megaraid_sas.h2
-rw-r--r--drivers/scsi/megaraid/megaraid_sas_base.c2
-rw-r--r--drivers/scsi/mpt2sas/mpi/mpi2_init.h2
-rw-r--r--drivers/scsi/mpt2sas/mpt2sas_base.c12
-rw-r--r--drivers/scsi/mpt2sas/mpt2sas_config.c2
-rw-r--r--drivers/scsi/mpt2sas/mpt2sas_ctl.c2
-rw-r--r--drivers/scsi/mpt2sas/mpt2sas_scsih.c20
-rw-r--r--drivers/scsi/ncr53c8xx.c2
-rw-r--r--drivers/scsi/nsp32.c6
-rw-r--r--drivers/scsi/nsp32.h2
-rw-r--r--drivers/scsi/osst.c6
-rw-r--r--drivers/scsi/osst.h2
-rw-r--r--drivers/scsi/pcmcia/nsp_cs.c2
-rw-r--r--drivers/scsi/pm8001/pm8001_hwi.c2
-rw-r--r--drivers/scsi/pm8001/pm8001_hwi.h4
-rw-r--r--drivers/scsi/pm8001/pm8001_sas.h2
-rw-r--r--drivers/scsi/pmcraid.c10
-rw-r--r--drivers/scsi/pmcraid.h2
-rw-r--r--drivers/scsi/qla1280.c2
-rw-r--r--drivers/scsi/qla2xxx/qla_def.h2
-rw-r--r--drivers/scsi/qla2xxx/qla_fw.h2
-rw-r--r--drivers/scsi/qla2xxx/qla_isr.c2
-rw-r--r--drivers/scsi/qla2xxx/qla_mbx.c6
-rw-r--r--drivers/scsi/qla2xxx/qla_nx.c2
-rw-r--r--drivers/scsi/qla2xxx/qla_os.c6
-rw-r--r--drivers/scsi/qla4xxx/ql4_def.h2
-rw-r--r--drivers/scsi/qla4xxx/ql4_init.c2
-rw-r--r--drivers/scsi/qla4xxx/ql4_nvram.h2
-rw-r--r--drivers/scsi/qla4xxx/ql4_os.c8
-rw-r--r--drivers/scsi/scsi_debug.c2
-rw-r--r--drivers/scsi/scsi_netlink.c2
-rw-r--r--drivers/scsi/scsi_tgt_lib.c2
-rw-r--r--drivers/scsi/scsi_transport_fc.c4
-rw-r--r--drivers/scsi/sd.c2
-rw-r--r--drivers/scsi/sr.c2
-rw-r--r--drivers/scsi/sun3_NCR5380.c6
-rw-r--r--drivers/scsi/sym53c416.c2
-rw-r--r--drivers/scsi/sym53c8xx_2/sym_fw1.h2
-rw-r--r--drivers/scsi/sym53c8xx_2/sym_fw2.h2
-rw-r--r--drivers/scsi/sym53c8xx_2/sym_hipd.c4
-rw-r--r--drivers/scsi/sym53c8xx_2/sym_malloc.c2
-rw-r--r--drivers/scsi/wd33c93.c2
-rw-r--r--drivers/scsi/wd7000.c2
134 files changed, 324 insertions, 324 deletions
diff --git a/drivers/scsi/3w-9xxx.h b/drivers/scsi/3w-9xxx.h
index 3343824855d0..040f7214e5b7 100644
--- a/drivers/scsi/3w-9xxx.h
+++ b/drivers/scsi/3w-9xxx.h
@@ -61,7 +61,7 @@ static twa_message_type twa_aen_table[] = {
61 {0x0000, "AEN queue empty"}, 61 {0x0000, "AEN queue empty"},
62 {0x0001, "Controller reset occurred"}, 62 {0x0001, "Controller reset occurred"},
63 {0x0002, "Degraded unit detected"}, 63 {0x0002, "Degraded unit detected"},
64 {0x0003, "Controller error occured"}, 64 {0x0003, "Controller error occurred"},
65 {0x0004, "Background rebuild failed"}, 65 {0x0004, "Background rebuild failed"},
66 {0x0005, "Background rebuild done"}, 66 {0x0005, "Background rebuild done"},
67 {0x0006, "Incomplete unit detected"}, 67 {0x0006, "Incomplete unit detected"},
diff --git a/drivers/scsi/3w-xxxx.h b/drivers/scsi/3w-xxxx.h
index 8b9f9d17e7fe..49dcf03c631a 100644
--- a/drivers/scsi/3w-xxxx.h
+++ b/drivers/scsi/3w-xxxx.h
@@ -8,7 +8,7 @@
8 8
9 Copyright (C) 1999-2010 3ware Inc. 9 Copyright (C) 1999-2010 3ware Inc.
10 10
11 Kernel compatiblity By: Andre Hedrick <andre@suse.com> 11 Kernel compatibility By: Andre Hedrick <andre@suse.com>
12 Non-Copyright (C) 2000 Andre Hedrick <andre@suse.com> 12 Non-Copyright (C) 2000 Andre Hedrick <andre@suse.com>
13 13
14 This program is free software; you can redistribute it and/or modify 14 This program is free software; you can redistribute it and/or modify
diff --git a/drivers/scsi/53c700.scr b/drivers/scsi/53c700.scr
index a064a092c604..ec822e3b7a27 100644
--- a/drivers/scsi/53c700.scr
+++ b/drivers/scsi/53c700.scr
@@ -31,7 +31,7 @@ ABSOLUTE StatusAddress = 0 ; Addr to receive status return
31ABSOLUTE ReceiveMsgAddress = 0 ; Addr to receive msg 31ABSOLUTE ReceiveMsgAddress = 0 ; Addr to receive msg
32; 32;
33; This is the magic component for handling scatter-gather. Each of the 33; This is the magic component for handling scatter-gather. Each of the
34; SG components is preceeded by a script fragment which moves the 34; SG components is preceded by a script fragment which moves the
35; necessary amount of data and jumps to the next SG segment. The final 35; necessary amount of data and jumps to the next SG segment. The final
36; SG segment jumps back to . However, this address is the first SG script 36; SG segment jumps back to . However, this address is the first SG script
37; segment. 37; segment.
diff --git a/drivers/scsi/53c700_d.h_shipped b/drivers/scsi/53c700_d.h_shipped
index 0b42a51257f2..aa623da333c8 100644
--- a/drivers/scsi/53c700_d.h_shipped
+++ b/drivers/scsi/53c700_d.h_shipped
@@ -34,7 +34,7 @@ ABSOLUTE StatusAddress = 0 ; Addr to receive status return
34ABSOLUTE ReceiveMsgAddress = 0 ; Addr to receive msg 34ABSOLUTE ReceiveMsgAddress = 0 ; Addr to receive msg
35; 35;
36; This is the magic component for handling scatter-gather. Each of the 36; This is the magic component for handling scatter-gather. Each of the
37; SG components is preceeded by a script fragment which moves the 37; SG components is preceded by a script fragment which moves the
38; necessary amount of data and jumps to the next SG segment. The final 38; necessary amount of data and jumps to the next SG segment. The final
39; SG segment jumps back to . However, this address is the first SG script 39; SG segment jumps back to . However, this address is the first SG script
40; segment. 40; segment.
diff --git a/drivers/scsi/FlashPoint.c b/drivers/scsi/FlashPoint.c
index e40cdfb7541f..dcd716d68600 100644
--- a/drivers/scsi/FlashPoint.c
+++ b/drivers/scsi/FlashPoint.c
@@ -2509,7 +2509,7 @@ static void FPT_ssel(unsigned long port, unsigned char p_card)
2509 WR_HARPOON(port + hp_autostart_3, 2509 WR_HARPOON(port + hp_autostart_3,
2510 (SELECT + SELCHK_STRT)); 2510 (SELECT + SELCHK_STRT));
2511 2511
2512 /* Setup our STATE so we know what happend when 2512 /* Setup our STATE so we know what happened when
2513 the wheels fall off. */ 2513 the wheels fall off. */
2514 currSCCB->Sccb_scsistat = SELECT_ST; 2514 currSCCB->Sccb_scsistat = SELECT_ST;
2515 2515
@@ -2900,7 +2900,7 @@ static void FPT_SendMsg(unsigned long port, unsigned char message)
2900 * 2900 *
2901 * Function: FPT_sdecm 2901 * Function: FPT_sdecm
2902 * 2902 *
2903 * Description: Determine the proper responce to the message from the 2903 * Description: Determine the proper response to the message from the
2904 * target device. 2904 * target device.
2905 * 2905 *
2906 *---------------------------------------------------------------------*/ 2906 *---------------------------------------------------------------------*/
diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c
index e7cd2fcbe036..165e4dd865d9 100644
--- a/drivers/scsi/NCR5380.c
+++ b/drivers/scsi/NCR5380.c
@@ -1198,12 +1198,12 @@ static irqreturn_t NCR5380_intr(int dummy, void *dev_id)
1198 */ 1198 */
1199 1199
1200 if ((NCR5380_read(MODE_REG) & MR_DMA) && ((basr & BASR_END_DMA_TRANSFER) || !(basr & BASR_PHASE_MATCH))) { 1200 if ((NCR5380_read(MODE_REG) & MR_DMA) && ((basr & BASR_END_DMA_TRANSFER) || !(basr & BASR_PHASE_MATCH))) {
1201 int transfered; 1201 int transferred;
1202 1202
1203 if (!hostdata->connected) 1203 if (!hostdata->connected)
1204 panic("scsi%d : received end of DMA interrupt with no connected cmd\n", instance->hostno); 1204 panic("scsi%d : received end of DMA interrupt with no connected cmd\n", instance->hostno);
1205 1205
1206 transfered = (hostdata->dmalen - NCR5380_dma_residual(instance)); 1206 transferred = (hostdata->dmalen - NCR5380_dma_residual(instance));
1207 hostdata->connected->SCp.this_residual -= transferred; 1207 hostdata->connected->SCp.this_residual -= transferred;
1208 hostdata->connected->SCp.ptr += transferred; 1208 hostdata->connected->SCp.ptr += transferred;
1209 hostdata->dmalen = 0; 1209 hostdata->dmalen = 0;
@@ -1563,7 +1563,7 @@ failed:
1563 * bytes to transfer, **data - pointer to data pointer. 1563 * bytes to transfer, **data - pointer to data pointer.
1564 * 1564 *
1565 * Returns : -1 when different phase is entered without transferring 1565 * Returns : -1 when different phase is entered without transferring
1566 * maximum number of bytes, 0 if all bytes or transfered or exit 1566 * maximum number of bytes, 0 if all bytes or transferred or exit
1567 * is in same phase. 1567 * is in same phase.
1568 * 1568 *
1569 * Also, *phase, *count, *data are modified in place. 1569 * Also, *phase, *count, *data are modified in place.
@@ -1800,7 +1800,7 @@ static int do_abort(struct Scsi_Host *host) {
1800 * bytes to transfer, **data - pointer to data pointer. 1800 * bytes to transfer, **data - pointer to data pointer.
1801 * 1801 *
1802 * Returns : -1 when different phase is entered without transferring 1802 * Returns : -1 when different phase is entered without transferring
1803 * maximum number of bytes, 0 if all bytes or transfered or exit 1803 * maximum number of bytes, 0 if all bytes or transferred or exit
1804 * is in same phase. 1804 * is in same phase.
1805 * 1805 *
1806 * Also, *phase, *count, *data are modified in place. 1806 * Also, *phase, *count, *data are modified in place.
diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c
index 118ce83a737c..061995741444 100644
--- a/drivers/scsi/aacraid/aachba.c
+++ b/drivers/scsi/aacraid/aachba.c
@@ -747,8 +747,8 @@ char * get_container_type(unsigned tindex)
747 * Arguments: [1] pointer to void [1] int 747 * Arguments: [1] pointer to void [1] int
748 * 748 *
749 * Purpose: Sets SCSI inquiry data strings for vendor, product 749 * Purpose: Sets SCSI inquiry data strings for vendor, product
750 * and revision level. Allows strings to be set in platform dependant 750 * and revision level. Allows strings to be set in platform dependent
751 * files instead of in OS dependant driver source. 751 * files instead of in OS dependent driver source.
752 */ 752 */
753 753
754static void setinqstr(struct aac_dev *dev, void *data, int tindex) 754static void setinqstr(struct aac_dev *dev, void *data, int tindex)
diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
index 29ab00016b78..ffb587817efc 100644
--- a/drivers/scsi/aacraid/aacraid.h
+++ b/drivers/scsi/aacraid/aacraid.h
@@ -1259,7 +1259,7 @@ struct aac_dev
1259#define CACHE_UNSTABLE 2 1259#define CACHE_UNSTABLE 2
1260 1260
1261/* 1261/*
1262 * Lets the client know at which level the data was commited on 1262 * Lets the client know at which level the data was committed on
1263 * a write request 1263 * a write request
1264 */ 1264 */
1265 1265
diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c
index dd7ad3ba2dad..e7d0d47b9185 100644
--- a/drivers/scsi/aacraid/commsup.c
+++ b/drivers/scsi/aacraid/commsup.c
@@ -421,7 +421,7 @@ int aac_fib_send(u16 command, struct fib *fibptr, unsigned long size,
421 if (!(hw_fib->header.XferState & cpu_to_le32(HostOwned))) 421 if (!(hw_fib->header.XferState & cpu_to_le32(HostOwned)))
422 return -EBUSY; 422 return -EBUSY;
423 /* 423 /*
424 * There are 5 cases with the wait and reponse requested flags. 424 * There are 5 cases with the wait and response requested flags.
425 * The only invalid cases are if the caller requests to wait and 425 * The only invalid cases are if the caller requests to wait and
426 * does not request a response and if the caller does not want a 426 * does not request a response and if the caller does not want a
427 * response and the Fib is not allocated from pool. If a response 427 * response and the Fib is not allocated from pool. If a response
diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c
index 081c6de92bc5..bfd618a69499 100644
--- a/drivers/scsi/advansys.c
+++ b/drivers/scsi/advansys.c
@@ -4544,7 +4544,7 @@ AscMemWordCopyPtrToLram(PortAddr iop_base, ushort s_addr,
4544 * Copy 4 bytes to LRAM. 4544 * Copy 4 bytes to LRAM.
4545 * 4545 *
4546 * The source data is assumed to be in little-endian order in memory 4546 * The source data is assumed to be in little-endian order in memory
4547 * and is maintained in little-endian order when writen to LRAM. 4547 * and is maintained in little-endian order when written to LRAM.
4548 */ 4548 */
4549static void 4549static void
4550AscMemDWordCopyPtrToLram(PortAddr iop_base, 4550AscMemDWordCopyPtrToLram(PortAddr iop_base,
diff --git a/drivers/scsi/aha1740.c b/drivers/scsi/aha1740.c
index d058f1ab82b5..1c10b796c1a2 100644
--- a/drivers/scsi/aha1740.c
+++ b/drivers/scsi/aha1740.c
@@ -461,7 +461,7 @@ static int aha1740_queuecommand_lck(Scsi_Cmnd * SCpnt, void (*done)(Scsi_Cmnd *)
461 /* The Adaptec Spec says the card is so fast that the loops 461 /* The Adaptec Spec says the card is so fast that the loops
462 will only be executed once in the code below. Even if this 462 will only be executed once in the code below. Even if this
463 was true with the fastest processors when the spec was 463 was true with the fastest processors when the spec was
464 written, it doesn't seem to be true with todays fast 464 written, it doesn't seem to be true with today's fast
465 processors. We print a warning if the code is executed more 465 processors. We print a warning if the code is executed more
466 often than LOOPCNT_WARN. If this happens, it should be 466 often than LOOPCNT_WARN. If this happens, it should be
467 investigated. If the count reaches LOOPCNT_MAX, we assume 467 investigated. If the count reaches LOOPCNT_MAX, we assume
diff --git a/drivers/scsi/aic7xxx/aic79xx.h b/drivers/scsi/aic7xxx/aic79xx.h
index 95ee50385188..9b059422aacb 100644
--- a/drivers/scsi/aic7xxx/aic79xx.h
+++ b/drivers/scsi/aic7xxx/aic79xx.h
@@ -473,7 +473,7 @@ struct hardware_scb {
473 * o A residual has occurred if SG_FULL_RESID is set in sgptr, 473 * o A residual has occurred if SG_FULL_RESID is set in sgptr,
474 * or residual_sgptr does not have SG_LIST_NULL set. 474 * or residual_sgptr does not have SG_LIST_NULL set.
475 * 475 *
476 * o We are transfering the last segment if residual_datacnt has 476 * o We are transferring the last segment if residual_datacnt has
477 * the SG_LAST_SEG flag set. 477 * the SG_LAST_SEG flag set.
478 * 478 *
479 * Host: 479 * Host:
@@ -516,7 +516,7 @@ struct hardware_scb {
516 */ 516 */
517 517
518/* 518/*
519 * Definition of a scatter/gather element as transfered to the controller. 519 * Definition of a scatter/gather element as transferred to the controller.
520 * The aic7xxx chips only support a 24bit length. We use the top byte of 520 * The aic7xxx chips only support a 24bit length. We use the top byte of
521 * the length to store additional address bits and a flag to indicate 521 * the length to store additional address bits and a flag to indicate
522 * that a given segment terminates the transfer. This gives us an 522 * that a given segment terminates the transfer. This gives us an
diff --git a/drivers/scsi/aic7xxx/aic79xx.reg b/drivers/scsi/aic7xxx/aic79xx.reg
index 0666c22ab55b..7e12c31ccfda 100644
--- a/drivers/scsi/aic7xxx/aic79xx.reg
+++ b/drivers/scsi/aic7xxx/aic79xx.reg
@@ -305,7 +305,7 @@ register HS_MAILBOX {
305} 305}
306 306
307/* 307/*
308 * Sequencer Interupt Status 308 * Sequencer Interrupt Status
309 */ 309 */
310register SEQINTSTAT { 310register SEQINTSTAT {
311 address 0x00C 311 address 0x00C
@@ -685,7 +685,7 @@ register DCHRXMSG0 {
685} 685}
686 686
687/* 687/*
688 * CMC Recieve Message 0 688 * CMC Receive Message 0
689 */ 689 */
690register CMCRXMSG0 { 690register CMCRXMSG0 {
691 address 0x090 691 address 0x090
@@ -696,7 +696,7 @@ register CMCRXMSG0 {
696} 696}
697 697
698/* 698/*
699 * Overlay Recieve Message 0 699 * Overlay Receive Message 0
700 */ 700 */
701register OVLYRXMSG0 { 701register OVLYRXMSG0 {
702 address 0x090 702 address 0x090
@@ -732,7 +732,7 @@ register DCHRXMSG1 {
732} 732}
733 733
734/* 734/*
735 * CMC Recieve Message 1 735 * CMC Receive Message 1
736 */ 736 */
737register CMCRXMSG1 { 737register CMCRXMSG1 {
738 address 0x091 738 address 0x091
@@ -742,7 +742,7 @@ register CMCRXMSG1 {
742} 742}
743 743
744/* 744/*
745 * Overlay Recieve Message 1 745 * Overlay Receive Message 1
746 */ 746 */
747register OVLYRXMSG1 { 747register OVLYRXMSG1 {
748 address 0x091 748 address 0x091
@@ -777,7 +777,7 @@ register DCHRXMSG2 {
777} 777}
778 778
779/* 779/*
780 * CMC Recieve Message 2 780 * CMC Receive Message 2
781 */ 781 */
782register CMCRXMSG2 { 782register CMCRXMSG2 {
783 address 0x092 783 address 0x092
@@ -787,7 +787,7 @@ register CMCRXMSG2 {
787} 787}
788 788
789/* 789/*
790 * Overlay Recieve Message 2 790 * Overlay Receive Message 2
791 */ 791 */
792register OVLYRXMSG2 { 792register OVLYRXMSG2 {
793 address 0x092 793 address 0x092
@@ -816,7 +816,7 @@ register DCHRXMSG3 {
816} 816}
817 817
818/* 818/*
819 * CMC Recieve Message 3 819 * CMC Receive Message 3
820 */ 820 */
821register CMCRXMSG3 { 821register CMCRXMSG3 {
822 address 0x093 822 address 0x093
@@ -826,7 +826,7 @@ register CMCRXMSG3 {
826} 826}
827 827
828/* 828/*
829 * Overlay Recieve Message 3 829 * Overlay Receive Message 3
830 */ 830 */
831register OVLYRXMSG3 { 831register OVLYRXMSG3 {
832 address 0x093 832 address 0x093
@@ -1249,7 +1249,7 @@ register TARGPCISTAT {
1249 1249
1250/* 1250/*
1251 * LQ Packet In 1251 * LQ Packet In
1252 * The last LQ Packet recieved 1252 * The last LQ Packet received
1253 */ 1253 */
1254register LQIN { 1254register LQIN {
1255 address 0x020 1255 address 0x020
@@ -2573,7 +2573,7 @@ register IOPDNCTL {
2573} 2573}
2574 2574
2575/* 2575/*
2576 * Shaddow Host Address. 2576 * Shadow Host Address.
2577 */ 2577 */
2578register SHADDR { 2578register SHADDR {
2579 address 0x060 2579 address 0x060
@@ -3983,7 +3983,7 @@ scratch_ram {
3983 3983
3984 /* 3984 /*
3985 * The maximum amount of time to wait, when interrupt coalescing 3985 * The maximum amount of time to wait, when interrupt coalescing
3986 * is enabled, before issueing a CMDCMPLT interrupt for a completed 3986 * is enabled, before issuing a CMDCMPLT interrupt for a completed
3987 * command. 3987 * command.
3988 */ 3988 */
3989 INT_COALESCING_TIMER { 3989 INT_COALESCING_TIMER {
diff --git a/drivers/scsi/aic7xxx/aic79xx.seq b/drivers/scsi/aic7xxx/aic79xx.seq
index 2fb78e35a9e5..3a36d9362a10 100644
--- a/drivers/scsi/aic7xxx/aic79xx.seq
+++ b/drivers/scsi/aic7xxx/aic79xx.seq
@@ -567,7 +567,7 @@ BEGIN_CRITICAL;
567 shr SELOID, 4, SCB_SCSIID; 567 shr SELOID, 4, SCB_SCSIID;
568 /* 568 /*
569 * If we want to send a message to the device, ensure 569 * If we want to send a message to the device, ensure
570 * we are selecting with atn irregardless of our packetized 570 * we are selecting with atn regardless of our packetized
571 * agreement. Since SPI4 only allows target reset or PPR 571 * agreement. Since SPI4 only allows target reset or PPR
572 * messages if this is a packetized connection, the change 572 * messages if this is a packetized connection, the change
573 * to our negotiation table entry for this selection will 573 * to our negotiation table entry for this selection will
@@ -960,7 +960,7 @@ p_status_okay:
960 * This is done to allow the host to send messages outside of an identify 960 * This is done to allow the host to send messages outside of an identify
961 * sequence while protecting the seqencer from testing the MK_MESSAGE bit 961 * sequence while protecting the seqencer from testing the MK_MESSAGE bit
962 * on an SCB that might not be for the current nexus. (For example, a 962 * on an SCB that might not be for the current nexus. (For example, a
963 * BDR message in responce to a bad reselection would leave us pointed to 963 * BDR message in response to a bad reselection would leave us pointed to
964 * an SCB that doesn't have anything to do with the current target). 964 * an SCB that doesn't have anything to do with the current target).
965 * 965 *
966 * Otherwise, treat MSG_OUT as a 1 byte message to send (abort, abort tag, 966 * Otherwise, treat MSG_OUT as a 1 byte message to send (abort, abort tag,
@@ -1507,7 +1507,7 @@ service_fifo:
1507 * If the other FIFO needs loading, then it 1507 * If the other FIFO needs loading, then it
1508 * must not have claimed the S/G cache yet 1508 * must not have claimed the S/G cache yet
1509 * (SG_CACHE_AVAIL would have been cleared in 1509 * (SG_CACHE_AVAIL would have been cleared in
1510 * the orginal FIFO mode and we test this above). 1510 * the original FIFO mode and we test this above).
1511 * Return to the idle loop so we can process the 1511 * Return to the idle loop so we can process the
1512 * FIFO not currently on the bus first. 1512 * FIFO not currently on the bus first.
1513 */ 1513 */
@@ -1521,7 +1521,7 @@ idle_sgfetch_okay:
1521idle_sgfetch_start: 1521idle_sgfetch_start:
1522 /* 1522 /*
1523 * We fetch a "cacheline aligned" and sized amount of data 1523 * We fetch a "cacheline aligned" and sized amount of data
1524 * so we don't end up referencing a non-existant page. 1524 * so we don't end up referencing a non-existent page.
1525 * Cacheline aligned is in quotes because the kernel will 1525 * Cacheline aligned is in quotes because the kernel will
1526 * set the prefetch amount to a reasonable level if the 1526 * set the prefetch amount to a reasonable level if the
1527 * cacheline size is unknown. 1527 * cacheline size is unknown.
@@ -1551,7 +1551,7 @@ idle_sg_avail:
1551 test DFSTATUS, PRELOAD_AVAIL jz return; 1551 test DFSTATUS, PRELOAD_AVAIL jz return;
1552 /* 1552 /*
1553 * On the A, preloading a segment before HDMAENACK 1553 * On the A, preloading a segment before HDMAENACK
1554 * comes true can clobber the shaddow address of the 1554 * comes true can clobber the shadow address of the
1555 * first segment in the S/G FIFO. Wait until it is 1555 * first segment in the S/G FIFO. Wait until it is
1556 * safe to proceed. 1556 * safe to proceed.
1557 */ 1557 */
@@ -2004,10 +2004,10 @@ pkt_handle_xfer:
2004 * Defer handling of this NONPACKREQ until we 2004 * Defer handling of this NONPACKREQ until we
2005 * can be sure it pertains to this FIFO. SAVEPTRS 2005 * can be sure it pertains to this FIFO. SAVEPTRS
2006 * will not be asserted if the NONPACKREQ is for us, 2006 * will not be asserted if the NONPACKREQ is for us,
2007 * so we must simulate it if shaddow is valid. If 2007 * so we must simulate it if shadow is valid. If
2008 * shaddow is not valid, keep running this FIFO until we 2008 * shadow is not valid, keep running this FIFO until we
2009 * have satisfied the transfer by loading segments and 2009 * have satisfied the transfer by loading segments and
2010 * waiting for either shaddow valid or last_seg_done. 2010 * waiting for either shadow valid or last_seg_done.
2011 */ 2011 */
2012 test MDFFSTAT, SHVALID jnz pkt_saveptrs; 2012 test MDFFSTAT, SHVALID jnz pkt_saveptrs;
2013pkt_service_fifo: 2013pkt_service_fifo:
@@ -2171,7 +2171,7 @@ pkt_status_check_nonpackreq:
2171 /* 2171 /*
2172 * The unexpected nonpkt phase handler assumes that any 2172 * The unexpected nonpkt phase handler assumes that any
2173 * data channel use will have a FIFO reference count. It 2173 * data channel use will have a FIFO reference count. It
2174 * turns out that the status handler doesn't need a refernce 2174 * turns out that the status handler doesn't need a references
2175 * count since the status received flag, and thus completion 2175 * count since the status received flag, and thus completion
2176 * processing, cannot be set until the handler is finished. 2176 * processing, cannot be set until the handler is finished.
2177 * We increment the count here to make the nonpkt handler 2177 * We increment the count here to make the nonpkt handler
diff --git a/drivers/scsi/aic7xxx/aic79xx_core.c b/drivers/scsi/aic7xxx/aic79xx_core.c
index 3233bf564435..5f8617dd43bb 100644
--- a/drivers/scsi/aic7xxx/aic79xx_core.c
+++ b/drivers/scsi/aic7xxx/aic79xx_core.c
@@ -562,7 +562,7 @@ ahd_targetcmd_offset(struct ahd_softc *ahd, u_int index)
562} 562}
563#endif 563#endif
564 564
565/*********************** Miscelaneous Support Functions ***********************/ 565/*********************** Miscellaneous Support Functions ***********************/
566/* 566/*
567 * Return pointers to the transfer negotiation information 567 * Return pointers to the transfer negotiation information
568 * for the specified our_id/remote_id pair. 568 * for the specified our_id/remote_id pair.
@@ -599,7 +599,7 @@ void
599ahd_outw(struct ahd_softc *ahd, u_int port, u_int value) 599ahd_outw(struct ahd_softc *ahd, u_int port, u_int value)
600{ 600{
601 /* 601 /*
602 * Write low byte first to accomodate registers 602 * Write low byte first to accommodate registers
603 * such as PRGMCNT where the order maters. 603 * such as PRGMCNT where the order maters.
604 */ 604 */
605 ahd_outb(ahd, port, value & 0xFF); 605 ahd_outb(ahd, port, value & 0xFF);
@@ -2067,7 +2067,7 @@ ahd_handle_seqint(struct ahd_softc *ahd, u_int intstat)
2067 * that requires host assistance for completion. 2067 * that requires host assistance for completion.
2068 * While handling the message phase(s), we will be 2068 * While handling the message phase(s), we will be
2069 * notified by the sequencer after each byte is 2069 * notified by the sequencer after each byte is
2070 * transfered so we can track bus phase changes. 2070 * transferred so we can track bus phase changes.
2071 * 2071 *
2072 * If this is the first time we've seen a HOST_MSG_LOOP 2072 * If this is the first time we've seen a HOST_MSG_LOOP
2073 * interrupt, initialize the state of the host message 2073 * interrupt, initialize the state of the host message
@@ -2487,7 +2487,7 @@ ahd_handle_scsiint(struct ahd_softc *ahd, u_int intstat)
2487 /* 2487 /*
2488 * Although the driver does not care about the 2488 * Although the driver does not care about the
2489 * 'Selection in Progress' status bit, the busy 2489 * 'Selection in Progress' status bit, the busy
2490 * LED does. SELINGO is only cleared by a successfull 2490 * LED does. SELINGO is only cleared by a successful
2491 * selection, so we must manually clear it to insure 2491 * selection, so we must manually clear it to insure
2492 * the LED turns off just incase no future successful 2492 * the LED turns off just incase no future successful
2493 * selections occur (e.g. no devices on the bus). 2493 * selections occur (e.g. no devices on the bus).
@@ -3548,7 +3548,7 @@ ahd_clear_critical_section(struct ahd_softc *ahd)
3548 ahd_outb(ahd, SEQCTL0, ahd_inb(ahd, SEQCTL0) & ~STEP); 3548 ahd_outb(ahd, SEQCTL0, ahd_inb(ahd, SEQCTL0) & ~STEP);
3549 ahd_outb(ahd, SIMODE1, simode1); 3549 ahd_outb(ahd, SIMODE1, simode1);
3550 /* 3550 /*
3551 * SCSIINT seems to glitch occassionally when 3551 * SCSIINT seems to glitch occasionally when
3552 * the interrupt masks are restored. Clear SCSIINT 3552 * the interrupt masks are restored. Clear SCSIINT
3553 * one more time so that only persistent errors 3553 * one more time so that only persistent errors
3554 * are seen as a real interrupt. 3554 * are seen as a real interrupt.
@@ -3838,7 +3838,7 @@ ahd_validate_width(struct ahd_softc *ahd, struct ahd_initiator_tinfo *tinfo,
3838 3838
3839/* 3839/*
3840 * Update the bitmask of targets for which the controller should 3840 * Update the bitmask of targets for which the controller should
3841 * negotiate with at the next convenient oportunity. This currently 3841 * negotiate with at the next convenient opportunity. This currently
3842 * means the next time we send the initial identify messages for 3842 * means the next time we send the initial identify messages for
3843 * a new transaction. 3843 * a new transaction.
3844 */ 3844 */
@@ -4200,7 +4200,7 @@ ahd_update_neg_table(struct ahd_softc *ahd, struct ahd_devinfo *devinfo,
4200 4200
4201 /* 4201 /*
4202 * During packetized transfers, the target will 4202 * During packetized transfers, the target will
4203 * give us the oportunity to send command packets 4203 * give us the opportunity to send command packets
4204 * without us asserting attention. 4204 * without us asserting attention.
4205 */ 4205 */
4206 if ((tinfo->ppr_options & MSG_EXT_PPR_IU_REQ) == 0) 4206 if ((tinfo->ppr_options & MSG_EXT_PPR_IU_REQ) == 0)
@@ -5651,7 +5651,7 @@ ahd_handle_msg_reject(struct ahd_softc *ahd, struct ahd_devinfo *devinfo)
5651 5651
5652 /* 5652 /*
5653 * Requeue all tagged commands for this target 5653 * Requeue all tagged commands for this target
5654 * currently in our posession so they can be 5654 * currently in our possession so they can be
5655 * converted to untagged commands. 5655 * converted to untagged commands.
5656 */ 5656 */
5657 ahd_search_qinfifo(ahd, SCB_GET_TARGET(ahd, scb), 5657 ahd_search_qinfifo(ahd, SCB_GET_TARGET(ahd, scb),
@@ -6245,7 +6245,7 @@ ahd_shutdown(void *arg)
6245/* 6245/*
6246 * Reset the controller and record some information about it 6246 * Reset the controller and record some information about it
6247 * that is only available just after a reset. If "reinit" is 6247 * that is only available just after a reset. If "reinit" is
6248 * non-zero, this reset occured after initial configuration 6248 * non-zero, this reset occurred after initial configuration
6249 * and the caller requests that the chip be fully reinitialized 6249 * and the caller requests that the chip be fully reinitialized
6250 * to a runable state. Chip interrupts are *not* enabled after 6250 * to a runable state. Chip interrupts are *not* enabled after
6251 * a reinitialization. The caller must enable interrupts via 6251 * a reinitialization. The caller must enable interrupts via
@@ -6495,7 +6495,7 @@ ahd_init_scbdata(struct ahd_softc *ahd)
6495 } 6495 }
6496 6496
6497 /* 6497 /*
6498 * Note that we were successfull 6498 * Note that we were successful
6499 */ 6499 */
6500 return (0); 6500 return (0);
6501 6501
@@ -7079,7 +7079,7 @@ ahd_init(struct ahd_softc *ahd)
7079 return (ENOMEM); 7079 return (ENOMEM);
7080 7080
7081 /* 7081 /*
7082 * Verify that the compiler hasn't over-agressively 7082 * Verify that the compiler hasn't over-aggressively
7083 * padded important structures. 7083 * padded important structures.
7084 */ 7084 */
7085 if (sizeof(struct hardware_scb) != 64) 7085 if (sizeof(struct hardware_scb) != 64)
@@ -10087,7 +10087,7 @@ ahd_write_seeprom(struct ahd_softc *ahd, uint16_t *buf,
10087 return (error); 10087 return (error);
10088 10088
10089 /* 10089 /*
10090 * Write the data. If we don't get throught the loop at 10090 * Write the data. If we don't get through the loop at
10091 * least once, the arguments were invalid. 10091 * least once, the arguments were invalid.
10092 */ 10092 */
10093 retval = EINVAL; 10093 retval = EINVAL;
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.c b/drivers/scsi/aic7xxx/aic79xx_osm.c
index 25d066624476..7d48700257a7 100644
--- a/drivers/scsi/aic7xxx/aic79xx_osm.c
+++ b/drivers/scsi/aic7xxx/aic79xx_osm.c
@@ -1441,7 +1441,7 @@ ahd_platform_set_tags(struct ahd_softc *ahd, struct scsi_device *sdev,
1441 usertags = ahd_linux_user_tagdepth(ahd, devinfo); 1441 usertags = ahd_linux_user_tagdepth(ahd, devinfo);
1442 if (!was_queuing) { 1442 if (!was_queuing) {
1443 /* 1443 /*
1444 * Start out agressively and allow our 1444 * Start out aggressively and allow our
1445 * dynamic queue depth algorithm to take 1445 * dynamic queue depth algorithm to take
1446 * care of the rest. 1446 * care of the rest.
1447 */ 1447 */
diff --git a/drivers/scsi/aic7xxx/aic7xxx.h b/drivers/scsi/aic7xxx/aic7xxx.h
index 17444bc18bca..f695774645c1 100644
--- a/drivers/scsi/aic7xxx/aic7xxx.h
+++ b/drivers/scsi/aic7xxx/aic7xxx.h
@@ -440,7 +440,7 @@ struct hardware_scb {
440 * o A residual has occurred if SG_FULL_RESID is set in sgptr, 440 * o A residual has occurred if SG_FULL_RESID is set in sgptr,
441 * or residual_sgptr does not have SG_LIST_NULL set. 441 * or residual_sgptr does not have SG_LIST_NULL set.
442 * 442 *
443 * o We are transfering the last segment if residual_datacnt has 443 * o We are transferring the last segment if residual_datacnt has
444 * the SG_LAST_SEG flag set. 444 * the SG_LAST_SEG flag set.
445 * 445 *
446 * Host: 446 * Host:
@@ -494,7 +494,7 @@ struct hardware_scb {
494 */ 494 */
495 495
496/* 496/*
497 * Definition of a scatter/gather element as transfered to the controller. 497 * Definition of a scatter/gather element as transferred to the controller.
498 * The aic7xxx chips only support a 24bit length. We use the top byte of 498 * The aic7xxx chips only support a 24bit length. We use the top byte of
499 * the length to store additional address bits and a flag to indicate 499 * the length to store additional address bits and a flag to indicate
500 * that a given segment terminates the transfer. This gives us an 500 * that a given segment terminates the transfer. This gives us an
diff --git a/drivers/scsi/aic7xxx/aic7xxx.reg b/drivers/scsi/aic7xxx/aic7xxx.reg
index 9a96e55da39a..ba0b411d03e2 100644
--- a/drivers/scsi/aic7xxx/aic7xxx.reg
+++ b/drivers/scsi/aic7xxx/aic7xxx.reg
@@ -351,7 +351,7 @@ register SSTAT2 {
351 address 0x00d 351 address 0x00d
352 access_mode RO 352 access_mode RO
353 field OVERRUN 0x80 353 field OVERRUN 0x80
354 field SHVALID 0x40 /* Shaddow Layer non-zero */ 354 field SHVALID 0x40 /* Shadow Layer non-zero */
355 field EXP_ACTIVE 0x10 /* SCSI Expander Active */ 355 field EXP_ACTIVE 0x10 /* SCSI Expander Active */
356 field CRCVALERR 0x08 /* CRC doesn't match (U3 only) */ 356 field CRCVALERR 0x08 /* CRC doesn't match (U3 only) */
357 field CRCENDERR 0x04 /* No terminal CRC packet (U3 only) */ 357 field CRCENDERR 0x04 /* No terminal CRC packet (U3 only) */
diff --git a/drivers/scsi/aic7xxx/aic7xxx.seq b/drivers/scsi/aic7xxx/aic7xxx.seq
index 5a4cfc954a9f..e60041e8f2d1 100644
--- a/drivers/scsi/aic7xxx/aic7xxx.seq
+++ b/drivers/scsi/aic7xxx/aic7xxx.seq
@@ -57,10 +57,10 @@ PREFIX = "ahc_"
57 * a later time. This problem cannot be resolved by holding a single entry 57 * a later time. This problem cannot be resolved by holding a single entry
58 * in scratch ram since a reconnecting target can request sense and this will 58 * in scratch ram since a reconnecting target can request sense and this will
59 * create yet another SCB waiting for selection. The solution used here is to 59 * create yet another SCB waiting for selection. The solution used here is to
60 * use byte 27 of the SCB as a psuedo-next pointer and to thread a list 60 * use byte 27 of the SCB as a pseudo-next pointer and to thread a list
61 * of SCBs that are awaiting selection. Since 0-0xfe are valid SCB indexes, 61 * of SCBs that are awaiting selection. Since 0-0xfe are valid SCB indexes,
62 * SCB_LIST_NULL is 0xff which is out of range. An entry is also added to 62 * SCB_LIST_NULL is 0xff which is out of range. An entry is also added to
63 * this list everytime a request sense occurs or after completing a non-tagged 63 * this list every time a request sense occurs or after completing a non-tagged
64 * command for which a second SCB has been queued. The sequencer will 64 * command for which a second SCB has been queued. The sequencer will
65 * automatically consume the entries. 65 * automatically consume the entries.
66 */ 66 */
@@ -752,7 +752,7 @@ idle_loop:
752 752
753 /* 753 /*
754 * We fetch a "cacheline aligned" and sized amount of data 754 * We fetch a "cacheline aligned" and sized amount of data
755 * so we don't end up referencing a non-existant page. 755 * so we don't end up referencing a non-existent page.
756 * Cacheline aligned is in quotes because the kernel will 756 * Cacheline aligned is in quotes because the kernel will
757 * set the prefetch amount to a reasonable level if the 757 * set the prefetch amount to a reasonable level if the
758 * cacheline size is unknown. 758 * cacheline size is unknown.
@@ -1485,7 +1485,7 @@ p_status_okay:
1485 * This is done to allow the host to send messages outside of an identify 1485 * This is done to allow the host to send messages outside of an identify
1486 * sequence while protecting the seqencer from testing the MK_MESSAGE bit 1486 * sequence while protecting the seqencer from testing the MK_MESSAGE bit
1487 * on an SCB that might not be for the current nexus. (For example, a 1487 * on an SCB that might not be for the current nexus. (For example, a
1488 * BDR message in responce to a bad reselection would leave us pointed to 1488 * BDR message in response to a bad reselection would leave us pointed to
1489 * an SCB that doesn't have anything to do with the current target). 1489 * an SCB that doesn't have anything to do with the current target).
1490 * 1490 *
1491 * Otherwise, treat MSG_OUT as a 1 byte message to send (abort, abort tag, 1491 * Otherwise, treat MSG_OUT as a 1 byte message to send (abort, abort tag,
@@ -1999,7 +1999,7 @@ if ((ahc->flags & AHC_TARGETROLE) != 0) {
1999 * from out to in, wait an additional data release delay before continuing. 1999 * from out to in, wait an additional data release delay before continuing.
2000 */ 2000 */
2001change_phase: 2001change_phase:
2002 /* Wait for preceeding I/O session to complete. */ 2002 /* Wait for preceding I/O session to complete. */
2003 test SCSISIGI, ACKI jnz .; 2003 test SCSISIGI, ACKI jnz .;
2004 2004
2005 /* Change the phase */ 2005 /* Change the phase */
diff --git a/drivers/scsi/aic7xxx/aic7xxx_core.c b/drivers/scsi/aic7xxx/aic7xxx_core.c
index e021b4812d58..dc28b0a91b22 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_core.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_core.c
@@ -427,7 +427,7 @@ ahc_targetcmd_offset(struct ahc_softc *ahc, u_int index)
427} 427}
428#endif 428#endif
429 429
430/*********************** Miscelaneous Support Functions ***********************/ 430/*********************** Miscellaneous Support Functions ***********************/
431/* 431/*
432 * Determine whether the sequencer reported a residual 432 * Determine whether the sequencer reported a residual
433 * for this SCB/transaction. 433 * for this SCB/transaction.
@@ -1243,7 +1243,7 @@ ahc_handle_seqint(struct ahc_softc *ahc, u_int intstat)
1243 * that requires host assistance for completion. 1243 * that requires host assistance for completion.
1244 * While handling the message phase(s), we will be 1244 * While handling the message phase(s), we will be
1245 * notified by the sequencer after each byte is 1245 * notified by the sequencer after each byte is
1246 * transfered so we can track bus phase changes. 1246 * transferred so we can track bus phase changes.
1247 * 1247 *
1248 * If this is the first time we've seen a HOST_MSG_LOOP 1248 * If this is the first time we've seen a HOST_MSG_LOOP
1249 * interrupt, initialize the state of the host message 1249 * interrupt, initialize the state of the host message
@@ -1487,7 +1487,7 @@ ahc_handle_seqint(struct ahc_softc *ahc, u_int intstat)
1487 scbptr, ahc_inb(ahc, ARG_1), 1487 scbptr, ahc_inb(ahc, ARG_1),
1488 ahc->scb_data->hscbs[scbptr].tag); 1488 ahc->scb_data->hscbs[scbptr].tag);
1489 ahc_dump_card_state(ahc); 1489 ahc_dump_card_state(ahc);
1490 panic("for saftey"); 1490 panic("for safety");
1491 break; 1491 break;
1492 } 1492 }
1493 case OUT_OF_RANGE: 1493 case OUT_OF_RANGE:
@@ -1733,7 +1733,7 @@ ahc_handle_scsiint(struct ahc_softc *ahc, u_int intstat)
1733 /* 1733 /*
1734 * Although the driver does not care about the 1734 * Although the driver does not care about the
1735 * 'Selection in Progress' status bit, the busy 1735 * 'Selection in Progress' status bit, the busy
1736 * LED does. SELINGO is only cleared by a successfull 1736 * LED does. SELINGO is only cleared by a successful
1737 * selection, so we must manually clear it to insure 1737 * selection, so we must manually clear it to insure
1738 * the LED turns off just incase no future successful 1738 * the LED turns off just incase no future successful
1739 * selections occur (e.g. no devices on the bus). 1739 * selections occur (e.g. no devices on the bus).
@@ -1943,7 +1943,7 @@ ahc_handle_scsiint(struct ahc_softc *ahc, u_int intstat)
1943 if (lastphase != P_BUSFREE) { 1943 if (lastphase != P_BUSFREE) {
1944 /* 1944 /*
1945 * Renegotiate with this device at the 1945 * Renegotiate with this device at the
1946 * next oportunity just in case this busfree 1946 * next opportunity just in case this busfree
1947 * is due to a negotiation mismatch with the 1947 * is due to a negotiation mismatch with the
1948 * device. 1948 * device.
1949 */ 1949 */
@@ -2442,7 +2442,7 @@ ahc_validate_width(struct ahc_softc *ahc, struct ahc_initiator_tinfo *tinfo,
2442 2442
2443/* 2443/*
2444 * Update the bitmask of targets for which the controller should 2444 * Update the bitmask of targets for which the controller should
2445 * negotiate with at the next convenient oportunity. This currently 2445 * negotiate with at the next convenient opportunity. This currently
2446 * means the next time we send the initial identify messages for 2446 * means the next time we send the initial identify messages for
2447 * a new transaction. 2447 * a new transaction.
2448 */ 2448 */
@@ -4131,7 +4131,7 @@ ahc_handle_msg_reject(struct ahc_softc *ahc, struct ahc_devinfo *devinfo)
4131 4131
4132 /* 4132 /*
4133 * Requeue all tagged commands for this target 4133 * Requeue all tagged commands for this target
4134 * currently in our posession so they can be 4134 * currently in our possession so they can be
4135 * converted to untagged commands. 4135 * converted to untagged commands.
4136 */ 4136 */
4137 ahc_search_qinfifo(ahc, SCB_GET_TARGET(ahc, scb), 4137 ahc_search_qinfifo(ahc, SCB_GET_TARGET(ahc, scb),
@@ -4581,7 +4581,7 @@ ahc_shutdown(void *arg)
4581/* 4581/*
4582 * Reset the controller and record some information about it 4582 * Reset the controller and record some information about it
4583 * that is only available just after a reset. If "reinit" is 4583 * that is only available just after a reset. If "reinit" is
4584 * non-zero, this reset occured after initial configuration 4584 * non-zero, this reset occurred after initial configuration
4585 * and the caller requests that the chip be fully reinitialized 4585 * and the caller requests that the chip be fully reinitialized
4586 * to a runable state. Chip interrupts are *not* enabled after 4586 * to a runable state. Chip interrupts are *not* enabled after
4587 * a reinitialization. The caller must enable interrupts via 4587 * a reinitialization. The caller must enable interrupts via
@@ -4899,7 +4899,7 @@ ahc_init_scbdata(struct ahc_softc *ahc)
4899 ahc->next_queued_scb = ahc_get_scb(ahc); 4899 ahc->next_queued_scb = ahc_get_scb(ahc);
4900 4900
4901 /* 4901 /*
4902 * Note that we were successfull 4902 * Note that we were successful
4903 */ 4903 */
4904 return (0); 4904 return (0);
4905 4905
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c
index 4a359bb307c6..c6251bb4f438 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_osm.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm.c
@@ -294,7 +294,7 @@ static uint32_t aic7xxx_extended;
294 * dubious at best. To my knowledge, this option has never actually 294 * dubious at best. To my knowledge, this option has never actually
295 * solved a PCI parity problem, but on certain machines with broken PCI 295 * solved a PCI parity problem, but on certain machines with broken PCI
296 * chipset configurations where stray PCI transactions with bad parity are 296 * chipset configurations where stray PCI transactions with bad parity are
297 * the norm rather than the exception, the error messages can be overwelming. 297 * the norm rather than the exception, the error messages can be overwhelming.
298 * It's included in the driver for completeness. 298 * It's included in the driver for completeness.
299 * 0 = Shut off PCI parity check 299 * 0 = Shut off PCI parity check
300 * non-0 = reverse polarity pci parity checking 300 * non-0 = reverse polarity pci parity checking
@@ -1318,7 +1318,7 @@ ahc_platform_set_tags(struct ahc_softc *ahc, struct scsi_device *sdev,
1318 usertags = ahc_linux_user_tagdepth(ahc, devinfo); 1318 usertags = ahc_linux_user_tagdepth(ahc, devinfo);
1319 if (!was_queuing) { 1319 if (!was_queuing) {
1320 /* 1320 /*
1321 * Start out agressively and allow our 1321 * Start out aggressively and allow our
1322 * dynamic queue depth algorithm to take 1322 * dynamic queue depth algorithm to take
1323 * care of the rest. 1323 * care of the rest.
1324 */ 1324 */
diff --git a/drivers/scsi/aic7xxx/aic7xxx_pci.c b/drivers/scsi/aic7xxx/aic7xxx_pci.c
index 2b11a4272364..6917b4f5ac9e 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_pci.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_pci.c
@@ -789,7 +789,7 @@ ahc_pci_config(struct ahc_softc *ahc, const struct ahc_pci_identity *entry)
789 ahc->bus_intr = ahc_pci_intr; 789 ahc->bus_intr = ahc_pci_intr;
790 ahc->bus_chip_init = ahc_pci_chip_init; 790 ahc->bus_chip_init = ahc_pci_chip_init;
791 791
792 /* Remeber how the card was setup in case there is no SEEPROM */ 792 /* Remember how the card was setup in case there is no SEEPROM */
793 if ((ahc_inb(ahc, HCNTRL) & POWRDN) == 0) { 793 if ((ahc_inb(ahc, HCNTRL) & POWRDN) == 0) {
794 ahc_pause(ahc); 794 ahc_pause(ahc);
795 if ((ahc->features & AHC_ULTRA2) != 0) 795 if ((ahc->features & AHC_ULTRA2) != 0)
@@ -860,7 +860,7 @@ ahc_pci_config(struct ahc_softc *ahc, const struct ahc_pci_identity *entry)
860 } 860 }
861 861
862 /* 862 /*
863 * We cannot perform ULTRA speeds without the presense 863 * We cannot perform ULTRA speeds without the presence
864 * of the external precision resistor. 864 * of the external precision resistor.
865 */ 865 */
866 if ((ahc->features & AHC_ULTRA) != 0) { 866 if ((ahc->features & AHC_ULTRA) != 0) {
@@ -969,7 +969,7 @@ ahc_pci_config(struct ahc_softc *ahc, const struct ahc_pci_identity *entry)
969} 969}
970 970
971/* 971/*
972 * Test for the presense of external sram in an 972 * Test for the presence of external sram in an
973 * "unshared" configuration. 973 * "unshared" configuration.
974 */ 974 */
975static int 975static int
diff --git a/drivers/scsi/aic7xxx/aicasm/aicasm_gram.y b/drivers/scsi/aic7xxx/aicasm/aicasm_gram.y
index e4064433842e..f1586a437906 100644
--- a/drivers/scsi/aic7xxx/aicasm/aicasm_gram.y
+++ b/drivers/scsi/aic7xxx/aicasm/aicasm_gram.y
@@ -803,7 +803,7 @@ macro_arglist:
803| macro_arglist ',' T_ARG 803| macro_arglist ',' T_ARG
804 { 804 {
805 if ($1 == 0) { 805 if ($1 == 0) {
806 stop("Comma without preceeding argument in arg list", 806 stop("Comma without preceding argument in arg list",
807 EX_DATAERR); 807 EX_DATAERR);
808 /* NOTREACHED */ 808 /* NOTREACHED */
809 } 809 }
@@ -1319,8 +1319,8 @@ code:
1319; 1319;
1320 1320
1321 /* 1321 /*
1322 * This grammer differs from the one in the aic7xxx 1322 * This grammar differs from the one in the aic7xxx
1323 * reference manual since the grammer listed there is 1323 * reference manual since the grammar listed there is
1324 * ambiguous and causes a shift/reduce conflict. 1324 * ambiguous and causes a shift/reduce conflict.
1325 * It also seems more logical as the "immediate" 1325 * It also seems more logical as the "immediate"
1326 * argument is listed as the second arg like the 1326 * argument is listed as the second arg like the
@@ -1799,7 +1799,7 @@ format_3_instr(int opcode, symbol_ref_t *src,
1799 instr = seq_alloc(); 1799 instr = seq_alloc();
1800 f3_instr = &instr->format.format3; 1800 f3_instr = &instr->format.format3;
1801 if (address->symbol == NULL) { 1801 if (address->symbol == NULL) {
1802 /* 'dot' referrence. Use the current instruction pointer */ 1802 /* 'dot' reference. Use the current instruction pointer */
1803 addr = instruction_ptr + address->offset; 1803 addr = instruction_ptr + address->offset;
1804 } else if (address->symbol->type == UNINITIALIZED) { 1804 } else if (address->symbol->type == UNINITIALIZED) {
1805 /* forward reference */ 1805 /* forward reference */
diff --git a/drivers/scsi/aic7xxx/aicasm/aicasm_macro_gram.y b/drivers/scsi/aic7xxx/aicasm/aicasm_macro_gram.y
index ff46aa6801bf..708326df0766 100644
--- a/drivers/scsi/aic7xxx/aicasm/aicasm_macro_gram.y
+++ b/drivers/scsi/aic7xxx/aicasm/aicasm_macro_gram.y
@@ -115,7 +115,7 @@ macro_arglist:
115| macro_arglist ',' T_ARG 115| macro_arglist ',' T_ARG
116 { 116 {
117 if ($1 == 0) { 117 if ($1 == 0) {
118 stop("Comma without preceeding argument in arg list", 118 stop("Comma without preceding argument in arg list",
119 EX_DATAERR); 119 EX_DATAERR);
120 /* NOTREACHED */ 120 /* NOTREACHED */
121 } 121 }
diff --git a/drivers/scsi/aic7xxx_old.c b/drivers/scsi/aic7xxx_old.c
index 4ff60a08df0f..5b212f0df898 100644
--- a/drivers/scsi/aic7xxx_old.c
+++ b/drivers/scsi/aic7xxx_old.c
@@ -905,7 +905,7 @@ struct aic_dev_data {
905 * problems with architectures I can't test on (because I don't have one, 905 * problems with architectures I can't test on (because I don't have one,
906 * such as the Alpha based systems) which happen to give faults for 906 * such as the Alpha based systems) which happen to give faults for
907 * non-aligned memory accesses, care was taken to align this structure 907 * non-aligned memory accesses, care was taken to align this structure
908 * in a way that gauranteed all accesses larger than 8 bits were aligned 908 * in a way that guaranteed all accesses larger than 8 bits were aligned
909 * on the appropriate boundary. It's also organized to try and be more 909 * on the appropriate boundary. It's also organized to try and be more
910 * cache line efficient. Be careful when changing this lest you might hurt 910 * cache line efficient. Be careful when changing this lest you might hurt
911 * overall performance and bring down the wrath of the masses. 911 * overall performance and bring down the wrath of the masses.
@@ -1180,7 +1180,7 @@ static int aic7xxx_pci_parity = 0;
1180 * the card's registers in a hex dump format tailored to each model of 1180 * the card's registers in a hex dump format tailored to each model of
1181 * controller. 1181 * controller.
1182 * 1182 *
1183 * NOTE: THE CONTROLLER IS LEFT IN AN UNUSEABLE STATE BY THIS OPTION. 1183 * NOTE: THE CONTROLLER IS LEFT IN AN UNUSABLE STATE BY THIS OPTION.
1184 * YOU CANNOT BOOT UP WITH THIS OPTION, IT IS FOR DEBUGGING PURPOSES 1184 * YOU CANNOT BOOT UP WITH THIS OPTION, IT IS FOR DEBUGGING PURPOSES
1185 * ONLY 1185 * ONLY
1186 */ 1186 */
@@ -3467,7 +3467,7 @@ aic7xxx_reset_current_bus(struct aic7xxx_host *p)
3467 /* Turn off the bus' current operations, after all, we shouldn't have any 3467 /* Turn off the bus' current operations, after all, we shouldn't have any
3468 * valid commands left to cause a RSELI and SELO once we've tossed the 3468 * valid commands left to cause a RSELI and SELO once we've tossed the
3469 * bus away with this reset, so we might as well shut down the sequencer 3469 * bus away with this reset, so we might as well shut down the sequencer
3470 * until the bus is restarted as oppossed to saving the current settings 3470 * until the bus is restarted as opposed to saving the current settings
3471 * and restoring them (which makes no sense to me). */ 3471 * and restoring them (which makes no sense to me). */
3472 3472
3473 /* Turn on the bus reset. */ 3473 /* Turn on the bus reset. */
@@ -4070,7 +4070,7 @@ aic7xxx_handle_seqint(struct aic7xxx_host *p, unsigned char intstat)
4070 aic_dev->max_q_depth = aic_dev->temp_q_depth = 1; 4070 aic_dev->max_q_depth = aic_dev->temp_q_depth = 1;
4071 /* 4071 /*
4072 * We set this command up as a bus device reset. However, we have 4072 * We set this command up as a bus device reset. However, we have
4073 * to clear the tag type as it's causing us problems. We shouldnt 4073 * to clear the tag type as it's causing us problems. We shouldn't
4074 * have to worry about any other commands being active, since if 4074 * have to worry about any other commands being active, since if
4075 * the device is refusing tagged commands, this should be the 4075 * the device is refusing tagged commands, this should be the
4076 * first tagged command sent to the device, however, we do have 4076 * first tagged command sent to the device, however, we do have
@@ -9748,7 +9748,7 @@ skip_pci_controller:
9748 } 9748 }
9749 9749
9750 /* 9750 /*
9751 * We are commited now, everything has been checked and this card 9751 * We are committed now, everything has been checked and this card
9752 * has been found, now we just set it up 9752 * has been found, now we just set it up
9753 */ 9753 */
9754 9754
@@ -9906,7 +9906,7 @@ skip_pci_controller:
9906 * 2: All PCI controllers with BIOS_ENABLED next, according to BIOS 9906 * 2: All PCI controllers with BIOS_ENABLED next, according to BIOS
9907 * address, going from lowest to highest. 9907 * address, going from lowest to highest.
9908 * 3: Remaining VLB/EISA controllers going in slot order. 9908 * 3: Remaining VLB/EISA controllers going in slot order.
9909 * 4: Remaining PCI controllers, going in PCI device order (reversable) 9909 * 4: Remaining PCI controllers, going in PCI device order (reversible)
9910 */ 9910 */
9911 9911
9912 { 9912 {
diff --git a/drivers/scsi/aic7xxx_old/aic7xxx.seq b/drivers/scsi/aic7xxx_old/aic7xxx.seq
index 1565be9ebd49..823ff2873229 100644
--- a/drivers/scsi/aic7xxx_old/aic7xxx.seq
+++ b/drivers/scsi/aic7xxx_old/aic7xxx.seq
@@ -51,7 +51,7 @@
51 * use byte 27 of the SCB as a pseudo-next pointer and to thread a list 51 * use byte 27 of the SCB as a pseudo-next pointer and to thread a list
52 * of SCBs that are awaiting selection. Since 0-0xfe are valid SCB indexes, 52 * of SCBs that are awaiting selection. Since 0-0xfe are valid SCB indexes,
53 * SCB_LIST_NULL is 0xff which is out of range. An entry is also added to 53 * SCB_LIST_NULL is 0xff which is out of range. An entry is also added to
54 * this list everytime a request sense occurs or after completing a non-tagged 54 * this list every time a request sense occurs or after completing a non-tagged
55 * command for which a second SCB has been queued. The sequencer will 55 * command for which a second SCB has been queued. The sequencer will
56 * automatically consume the entries. 56 * automatically consume the entries.
57 */ 57 */
@@ -696,7 +696,7 @@ p_status:
696 * This is done to allow the hsot to send messages outside of an identify 696 * This is done to allow the hsot to send messages outside of an identify
697 * sequence while protecting the seqencer from testing the MK_MESSAGE bit 697 * sequence while protecting the seqencer from testing the MK_MESSAGE bit
698 * on an SCB that might not be for the current nexus. (For example, a 698 * on an SCB that might not be for the current nexus. (For example, a
699 * BDR message in responce to a bad reselection would leave us pointed to 699 * BDR message in response to a bad reselection would leave us pointed to
700 * an SCB that doesn't have anything to do with the current target). 700 * an SCB that doesn't have anything to do with the current target).
701 * Otherwise, treat MSG_OUT as a 1 byte message to send (abort, abort tag, 701 * Otherwise, treat MSG_OUT as a 1 byte message to send (abort, abort tag,
702 * bus device reset). 702 * bus device reset).
@@ -716,8 +716,8 @@ p_mesgout_identify:
716 } else { 716 } else {
717 and SINDEX,0x7,SCB_TCL; /* lun */ 717 and SINDEX,0x7,SCB_TCL; /* lun */
718 } 718 }
719 and A,DISCENB,SCB_CONTROL; /* mask off disconnect privledge */ 719 and A,DISCENB,SCB_CONTROL; /* mask off disconnect privilege */
720 or SINDEX,A; /* or in disconnect privledge */ 720 or SINDEX,A; /* or in disconnect privilege */
721 or SINDEX,MSG_IDENTIFYFLAG; 721 or SINDEX,MSG_IDENTIFYFLAG;
722p_mesgout_mk_message: 722p_mesgout_mk_message:
723 test SCB_CONTROL,MK_MESSAGE jz p_mesgout_tag; 723 test SCB_CONTROL,MK_MESSAGE jz p_mesgout_tag;
diff --git a/drivers/scsi/aic94xx/aic94xx_reg_def.h b/drivers/scsi/aic94xx/aic94xx_reg_def.h
index 40273a747d29..dd6cc8008b16 100644
--- a/drivers/scsi/aic94xx/aic94xx_reg_def.h
+++ b/drivers/scsi/aic94xx/aic94xx_reg_def.h
@@ -2134,7 +2134,7 @@
2134* The host accesses this scratch in a different manner from the 2134* The host accesses this scratch in a different manner from the
2135* link sequencer. The sequencer has to use LSEQ registers 2135* link sequencer. The sequencer has to use LSEQ registers
2136* LmSCRPAGE and LmMnSCRPAGE to access the scratch memory. A flat 2136* LmSCRPAGE and LmMnSCRPAGE to access the scratch memory. A flat
2137* mapping of the scratch memory is avaliable for software 2137* mapping of the scratch memory is available for software
2138* convenience and to prevent corruption while the sequencer is 2138* convenience and to prevent corruption while the sequencer is
2139* running. This memory is mapped onto addresses 800h - 9FFh. 2139* running. This memory is mapped onto addresses 800h - 9FFh.
2140* 2140*
diff --git a/drivers/scsi/arm/acornscsi.c b/drivers/scsi/arm/acornscsi.c
index ec166726b314..c454e44cf51c 100644
--- a/drivers/scsi/arm/acornscsi.c
+++ b/drivers/scsi/arm/acornscsi.c
@@ -100,7 +100,7 @@
100 */ 100 */
101#define TIMEOUT_TIME 10 101#define TIMEOUT_TIME 10
102/* 102/*
103 * Define this if you want to have verbose explaination of SCSI 103 * Define this if you want to have verbose explanation of SCSI
104 * status/messages. 104 * status/messages.
105 */ 105 */
106#undef CONFIG_ACORNSCSI_CONSTANTS 106#undef CONFIG_ACORNSCSI_CONSTANTS
@@ -1561,7 +1561,7 @@ void acornscsi_message(AS_Host *host)
1561 /* 1561 /*
1562 * If we were negociating sync transfer, we don't yet know if 1562 * If we were negociating sync transfer, we don't yet know if
1563 * this REJECT is for the sync transfer or for the tagged queue/wide 1563 * this REJECT is for the sync transfer or for the tagged queue/wide
1564 * transfer. Re-initiate sync transfer negociation now, and if 1564 * transfer. Re-initiate sync transfer negotiation now, and if
1565 * we got a REJECT in response to SDTR, then it'll be set to DONE. 1565 * we got a REJECT in response to SDTR, then it'll be set to DONE.
1566 */ 1566 */
1567 if (host->device[host->SCpnt->device->id].sync_state == SYNC_SENT_REQUEST) 1567 if (host->device[host->SCpnt->device->id].sync_state == SYNC_SENT_REQUEST)
diff --git a/drivers/scsi/arm/acornscsi.h b/drivers/scsi/arm/acornscsi.h
index 8d2172a0b351..01bc715a3aec 100644
--- a/drivers/scsi/arm/acornscsi.h
+++ b/drivers/scsi/arm/acornscsi.h
@@ -223,8 +223,8 @@ typedef enum {
223 * Synchronous transfer state 223 * Synchronous transfer state
224 */ 224 */
225typedef enum { /* Synchronous transfer state */ 225typedef enum { /* Synchronous transfer state */
226 SYNC_ASYNCHRONOUS, /* don't negociate synchronous transfers*/ 226 SYNC_ASYNCHRONOUS, /* don't negotiate synchronous transfers*/
227 SYNC_NEGOCIATE, /* start negociation */ 227 SYNC_NEGOCIATE, /* start negotiation */
228 SYNC_SENT_REQUEST, /* sent SDTR message */ 228 SYNC_SENT_REQUEST, /* sent SDTR message */
229 SYNC_COMPLETED, /* received SDTR reply */ 229 SYNC_COMPLETED, /* received SDTR reply */
230} syncxfer_t; 230} syncxfer_t;
@@ -322,7 +322,7 @@ typedef struct acornscsi_hostdata {
322 /* per-device info */ 322 /* per-device info */
323 struct { 323 struct {
324 unsigned char sync_xfer; /* synchronous transfer (SBIC value) */ 324 unsigned char sync_xfer; /* synchronous transfer (SBIC value) */
325 syncxfer_t sync_state; /* sync xfer negociation state */ 325 syncxfer_t sync_state; /* sync xfer negotiation state */
326 unsigned char disconnect_ok:1; /* device can disconnect */ 326 unsigned char disconnect_ok:1; /* device can disconnect */
327 } device[8]; 327 } device[8];
328 unsigned long busyluns[64 / sizeof(unsigned long)];/* array of bits indicating LUNs busy */ 328 unsigned long busyluns[64 / sizeof(unsigned long)];/* array of bits indicating LUNs busy */
diff --git a/drivers/scsi/arm/arxescsi.c b/drivers/scsi/arm/arxescsi.c
index 2836fe248df9..a750aa72b8ef 100644
--- a/drivers/scsi/arm/arxescsi.c
+++ b/drivers/scsi/arm/arxescsi.c
@@ -228,7 +228,7 @@ static const char *arxescsi_info(struct Scsi_Host *host)
228 * Params : buffer - a buffer to write information to 228 * Params : buffer - a buffer to write information to
229 * start - a pointer into this buffer set by this routine to the start 229 * start - a pointer into this buffer set by this routine to the start
230 * of the required information. 230 * of the required information.
231 * offset - offset into information that we have read upto. 231 * offset - offset into information that we have read up to.
232 * length - length of buffer 232 * length - length of buffer
233 * host_no - host number to return information for 233 * host_no - host number to return information for
234 * inout - 0 for reading, 1 for writing. 234 * inout - 0 for reading, 1 for writing.
diff --git a/drivers/scsi/arm/cumana_2.c b/drivers/scsi/arm/cumana_2.c
index c9902b5c1f2b..547987b86384 100644
--- a/drivers/scsi/arm/cumana_2.c
+++ b/drivers/scsi/arm/cumana_2.c
@@ -344,7 +344,7 @@ cumanascsi_2_set_proc_info(struct Scsi_Host *host, char *buffer, int length)
344 * Params : buffer - a buffer to write information to 344 * Params : buffer - a buffer to write information to
345 * start - a pointer into this buffer set by this routine to the start 345 * start - a pointer into this buffer set by this routine to the start
346 * of the required information. 346 * of the required information.
347 * offset - offset into information that we have read upto. 347 * offset - offset into information that we have read up to.
348 * length - length of buffer 348 * length - length of buffer
349 * host_no - host number to return information for 349 * host_no - host number to return information for
350 * inout - 0 for reading, 1 for writing. 350 * inout - 0 for reading, 1 for writing.
diff --git a/drivers/scsi/arm/eesox.c b/drivers/scsi/arm/eesox.c
index d8435132f461..edfd12b48c28 100644
--- a/drivers/scsi/arm/eesox.c
+++ b/drivers/scsi/arm/eesox.c
@@ -429,7 +429,7 @@ eesoxscsi_set_proc_info(struct Scsi_Host *host, char *buffer, int length)
429 * Params : buffer - a buffer to write information to 429 * Params : buffer - a buffer to write information to
430 * start - a pointer into this buffer set by this routine to the start 430 * start - a pointer into this buffer set by this routine to the start
431 * of the required information. 431 * of the required information.
432 * offset - offset into information that we have read upto. 432 * offset - offset into information that we have read up to.
433 * length - length of buffer 433 * length - length of buffer
434 * host_no - host number to return information for 434 * host_no - host number to return information for
435 * inout - 0 for reading, 1 for writing. 435 * inout - 0 for reading, 1 for writing.
diff --git a/drivers/scsi/arm/fas216.c b/drivers/scsi/arm/fas216.c
index 2b2ce21e227e..e85c40b6e19b 100644
--- a/drivers/scsi/arm/fas216.c
+++ b/drivers/scsi/arm/fas216.c
@@ -2119,7 +2119,7 @@ request_sense:
2119 * executed, unless a target connects to us. 2119 * executed, unless a target connects to us.
2120 */ 2120 */
2121 if (info->reqSCpnt) 2121 if (info->reqSCpnt)
2122 printk(KERN_WARNING "scsi%d.%c: loosing request command\n", 2122 printk(KERN_WARNING "scsi%d.%c: losing request command\n",
2123 info->host->host_no, '0' + SCpnt->device->id); 2123 info->host->host_no, '0' + SCpnt->device->id);
2124 info->reqSCpnt = SCpnt; 2124 info->reqSCpnt = SCpnt;
2125} 2125}
@@ -2294,7 +2294,7 @@ static int fas216_noqueue_command_lck(struct scsi_cmnd *SCpnt,
2294 * If we don't have an IRQ, then we must poll the card for 2294 * If we don't have an IRQ, then we must poll the card for
2295 * it's interrupt, and use that to call this driver's 2295 * it's interrupt, and use that to call this driver's
2296 * interrupt routine. That way, we keep the command 2296 * interrupt routine. That way, we keep the command
2297 * progressing. Maybe we can add some inteligence here 2297 * progressing. Maybe we can add some intelligence here
2298 * and go to sleep if we know that the device is going 2298 * and go to sleep if we know that the device is going
2299 * to be some time (eg, disconnected). 2299 * to be some time (eg, disconnected).
2300 */ 2300 */
diff --git a/drivers/scsi/arm/fas216.h b/drivers/scsi/arm/fas216.h
index f30f8d659dc4..84b7127c0121 100644
--- a/drivers/scsi/arm/fas216.h
+++ b/drivers/scsi/arm/fas216.h
@@ -203,11 +203,11 @@ typedef enum {
203} fasdmatype_t; 203} fasdmatype_t;
204 204
205typedef enum { 205typedef enum {
206 neg_wait, /* Negociate with device */ 206 neg_wait, /* Negotiate with device */
207 neg_inprogress, /* Negociation sent */ 207 neg_inprogress, /* Negotiation sent */
208 neg_complete, /* Negociation complete */ 208 neg_complete, /* Negotiation complete */
209 neg_targcomplete, /* Target completed negociation */ 209 neg_targcomplete, /* Target completed negotiation */
210 neg_invalid /* Negociation not supported */ 210 neg_invalid /* Negotiation not supported */
211} neg_t; 211} neg_t;
212 212
213#define MAGIC 0x441296bdUL 213#define MAGIC 0x441296bdUL
diff --git a/drivers/scsi/arm/powertec.c b/drivers/scsi/arm/powertec.c
index e2297b4c1b9e..9274c0677b9c 100644
--- a/drivers/scsi/arm/powertec.c
+++ b/drivers/scsi/arm/powertec.c
@@ -232,7 +232,7 @@ powertecscsi_set_proc_info(struct Scsi_Host *host, char *buffer, int length)
232 * Params : buffer - a buffer to write information to 232 * Params : buffer - a buffer to write information to
233 * start - a pointer into this buffer set by this routine to the start 233 * start - a pointer into this buffer set by this routine to the start
234 * of the required information. 234 * of the required information.
235 * offset - offset into information that we have read upto. 235 * offset - offset into information that we have read up to.
236 * length - length of buffer 236 * length - length of buffer
237 * inout - 0 for reading, 1 for writing. 237 * inout - 0 for reading, 1 for writing.
238 * Returns : length of data written to buffer. 238 * Returns : length of data written to buffer.
diff --git a/drivers/scsi/atari_NCR5380.c b/drivers/scsi/atari_NCR5380.c
index 88b2928b4d3b..ea439f93ed81 100644
--- a/drivers/scsi/atari_NCR5380.c
+++ b/drivers/scsi/atari_NCR5380.c
@@ -464,7 +464,7 @@ static void free_all_tags(void)
464 * 464 *
465 * Parameters: Scsi_Cmnd *cmd 465 * Parameters: Scsi_Cmnd *cmd
466 * The command to work on. The first scatter buffer's data are 466 * The command to work on. The first scatter buffer's data are
467 * assumed to be already transfered into ptr/this_residual. 467 * assumed to be already transferred into ptr/this_residual.
468 */ 468 */
469 469
470static void merge_contiguous_buffers(Scsi_Cmnd *cmd) 470static void merge_contiguous_buffers(Scsi_Cmnd *cmd)
@@ -1720,7 +1720,7 @@ static int NCR5380_select(struct Scsi_Host *instance, Scsi_Cmnd *cmd, int tag)
1720 * bytes to transfer, **data - pointer to data pointer. 1720 * bytes to transfer, **data - pointer to data pointer.
1721 * 1721 *
1722 * Returns : -1 when different phase is entered without transferring 1722 * Returns : -1 when different phase is entered without transferring
1723 * maximum number of bytes, 0 if all bytes are transfered or exit 1723 * maximum number of bytes, 0 if all bytes are transferred or exit
1724 * is in same phase. 1724 * is in same phase.
1725 * 1725 *
1726 * Also, *phase, *count, *data are modified in place. 1726 * Also, *phase, *count, *data are modified in place.
@@ -1911,7 +1911,7 @@ static int do_abort(struct Scsi_Host *host)
1911 * bytes to transfer, **data - pointer to data pointer. 1911 * bytes to transfer, **data - pointer to data pointer.
1912 * 1912 *
1913 * Returns : -1 when different phase is entered without transferring 1913 * Returns : -1 when different phase is entered without transferring
1914 * maximum number of bytes, 0 if all bytes or transfered or exit 1914 * maximum number of bytes, 0 if all bytes or transferred or exit
1915 * is in same phase. 1915 * is in same phase.
1916 * 1916 *
1917 * Also, *phase, *count, *data are modified in place. 1917 * Also, *phase, *count, *data are modified in place.
diff --git a/drivers/scsi/atp870u.c b/drivers/scsi/atp870u.c
index 76029d570beb..7e6eca4a125e 100644
--- a/drivers/scsi/atp870u.c
+++ b/drivers/scsi/atp870u.c
@@ -1228,7 +1228,7 @@ TCM_5: /* isolation complete.. */
1228 printk(" \n%x %x %x %s\n ",assignid_map,mbuf[0],mbuf[1],&mbuf[2]); */ 1228 printk(" \n%x %x %x %s\n ",assignid_map,mbuf[0],mbuf[1],&mbuf[2]); */
1229 i = 15; 1229 i = 15;
1230 j = mbuf[0]; 1230 j = mbuf[0];
1231 if ((j & 0x20) != 0) { /* bit5=1:ID upto 7 */ 1231 if ((j & 0x20) != 0) { /* bit5=1:ID up to 7 */
1232 i = 7; 1232 i = 7;
1233 } 1233 }
1234 if ((j & 0x06) == 0) { /* IDvalid? */ 1234 if ((j & 0x06) == 0) { /* IDvalid? */
diff --git a/drivers/scsi/be2iscsi/be_cmds.h b/drivers/scsi/be2iscsi/be_cmds.h
index 5218de4ab35a..fbd1dc2c15f7 100644
--- a/drivers/scsi/be2iscsi/be_cmds.h
+++ b/drivers/scsi/be2iscsi/be_cmds.h
@@ -877,7 +877,7 @@ struct be_all_if_id {
877 */ 877 */
878#define CXN_KILLED_PDU_SIZE_EXCEEDS_DSL 3 /* Connection got invalidated 878#define CXN_KILLED_PDU_SIZE_EXCEEDS_DSL 3 /* Connection got invalidated
879 * internally 879 * internally
880 * due to a recieved PDU 880 * due to a received PDU
881 * size > DSL 881 * size > DSL
882 */ 882 */
883#define CXN_KILLED_BURST_LEN_MISMATCH 4 /* Connection got invalidated 883#define CXN_KILLED_BURST_LEN_MISMATCH 4 /* Connection got invalidated
@@ -886,7 +886,7 @@ struct be_all_if_id {
886 * FBL/MBL. 886 * FBL/MBL.
887 */ 887 */
888#define CXN_KILLED_AHS_RCVD 5 /* Connection got invalidated 888#define CXN_KILLED_AHS_RCVD 5 /* Connection got invalidated
889 * internally due to a recieved 889 * internally due to a received
890 * PDU Hdr that has 890 * PDU Hdr that has
891 * AHS */ 891 * AHS */
892#define CXN_KILLED_HDR_DIGEST_ERR 6 /* Connection got invalidated 892#define CXN_KILLED_HDR_DIGEST_ERR 6 /* Connection got invalidated
@@ -899,12 +899,12 @@ struct be_all_if_id {
899 * pdu hdr 899 * pdu hdr
900 */ 900 */
901#define CXN_KILLED_STALE_ITT_TTT_RCVD 8 /* Connection got invalidated 901#define CXN_KILLED_STALE_ITT_TTT_RCVD 8 /* Connection got invalidated
902 * internally due to a recieved 902 * internally due to a received
903 * ITT/TTT that does not belong 903 * ITT/TTT that does not belong
904 * to this Connection 904 * to this Connection
905 */ 905 */
906#define CXN_KILLED_INVALID_ITT_TTT_RCVD 9 /* Connection got invalidated 906#define CXN_KILLED_INVALID_ITT_TTT_RCVD 9 /* Connection got invalidated
907 * internally due to recieved 907 * internally due to received
908 * ITT/TTT value > Max 908 * ITT/TTT value > Max
909 * Supported ITTs/TTTs 909 * Supported ITTs/TTTs
910 */ 910 */
@@ -936,21 +936,21 @@ struct be_all_if_id {
936 * index. 936 * index.
937 */ 937 */
938#define CXN_KILLED_OVER_RUN_RESIDUAL 16 /* Command got invalidated 938#define CXN_KILLED_OVER_RUN_RESIDUAL 16 /* Command got invalidated
939 * internally due to recived 939 * internally due to received
940 * command has residual 940 * command has residual
941 * over run bytes. 941 * over run bytes.
942 */ 942 */
943#define CXN_KILLED_UNDER_RUN_RESIDUAL 17 /* Command got invalidated 943#define CXN_KILLED_UNDER_RUN_RESIDUAL 17 /* Command got invalidated
944 * internally due to recived 944 * internally due to received
945 * command has residual under 945 * command has residual under
946 * run bytes. 946 * run bytes.
947 */ 947 */
948#define CMD_KILLED_INVALID_STATSN_RCVD 18 /* Command got invalidated 948#define CMD_KILLED_INVALID_STATSN_RCVD 18 /* Command got invalidated
949 * internally due to a recieved 949 * internally due to a received
950 * PDU has an invalid StatusSN 950 * PDU has an invalid StatusSN
951 */ 951 */
952#define CMD_KILLED_INVALID_R2T_RCVD 19 /* Command got invalidated 952#define CMD_KILLED_INVALID_R2T_RCVD 19 /* Command got invalidated
953 * internally due to a recieved 953 * internally due to a received
954 * an R2T with some invalid 954 * an R2T with some invalid
955 * fields in it 955 * fields in it
956 */ 956 */
@@ -973,7 +973,7 @@ struct be_all_if_id {
973 */ 973 */
974#define CMD_CXN_KILLED_INVALID_DATASN_RCVD 24 /* Command got invalidated 974#define CMD_CXN_KILLED_INVALID_DATASN_RCVD 24 /* Command got invalidated
975 * internally due to a 975 * internally due to a
976 * recieved PDU has an invalid 976 * received PDU has an invalid
977 * DataSN 977 * DataSN
978 */ 978 */
979#define CXN_INVALIDATE_NOTIFY 25 /* Connection invalidation 979#define CXN_INVALIDATE_NOTIFY 25 /* Connection invalidation
diff --git a/drivers/scsi/bfa/bfa_core.c b/drivers/scsi/bfa/bfa_core.c
index 1cd5c8b0618d..91838c51fb76 100644
--- a/drivers/scsi/bfa/bfa_core.c
+++ b/drivers/scsi/bfa/bfa_core.c
@@ -355,7 +355,7 @@ bfa_msix_lpu_err(struct bfa_s *bfa, int vec)
355 /* 355 /*
356 * ERR_PSS bit needs to be cleared as well in case 356 * ERR_PSS bit needs to be cleared as well in case
357 * interrups are shared so driver's interrupt handler is 357 * interrups are shared so driver's interrupt handler is
358 * still called eventhough it is already masked out. 358 * still called even though it is already masked out.
359 */ 359 */
360 curr_value = readl( 360 curr_value = readl(
361 bfa->ioc.ioc_regs.pss_err_status_reg); 361 bfa->ioc.ioc_regs.pss_err_status_reg);
diff --git a/drivers/scsi/bfa/bfa_defs_svc.h b/drivers/scsi/bfa/bfa_defs_svc.h
index 648c84176722..207f598877c7 100644
--- a/drivers/scsi/bfa/bfa_defs_svc.h
+++ b/drivers/scsi/bfa/bfa_defs_svc.h
@@ -145,7 +145,7 @@ struct bfa_fw_io_stats_s {
145 u32 ioh_data_oor_event; /* Data out of range */ 145 u32 ioh_data_oor_event; /* Data out of range */
146 u32 ioh_ro_ooo_event; /* Relative offset out of range */ 146 u32 ioh_ro_ooo_event; /* Relative offset out of range */
147 u32 ioh_cpu_owned_event; /* IOH hit -iost owned by f/w */ 147 u32 ioh_cpu_owned_event; /* IOH hit -iost owned by f/w */
148 u32 ioh_unexp_frame_event; /* unexpected frame recieved 148 u32 ioh_unexp_frame_event; /* unexpected frame received
149 * count */ 149 * count */
150 u32 ioh_err_int; /* IOH error int during data-phase 150 u32 ioh_err_int; /* IOH error int during data-phase
151 * for scsi write 151 * for scsi write
@@ -566,8 +566,8 @@ struct bfa_itnim_iostats_s {
566 u32 input_reqs; /* Data in-bound requests */ 566 u32 input_reqs; /* Data in-bound requests */
567 u32 output_reqs; /* Data out-bound requests */ 567 u32 output_reqs; /* Data out-bound requests */
568 u32 io_comps; /* Total IO Completions */ 568 u32 io_comps; /* Total IO Completions */
569 u32 wr_throughput; /* Write data transfered in bytes */ 569 u32 wr_throughput; /* Write data transferred in bytes */
570 u32 rd_throughput; /* Read data transfered in bytes */ 570 u32 rd_throughput; /* Read data transferred in bytes */
571 571
572 u32 iocomp_ok; /* Slowpath IO completions */ 572 u32 iocomp_ok; /* Slowpath IO completions */
573 u32 iocomp_underrun; /* IO underrun */ 573 u32 iocomp_underrun; /* IO underrun */
diff --git a/drivers/scsi/bfa/bfa_fc.h b/drivers/scsi/bfa/bfa_fc.h
index 8e764fae8dc9..bf0067e0fd0d 100644
--- a/drivers/scsi/bfa/bfa_fc.h
+++ b/drivers/scsi/bfa/bfa_fc.h
@@ -315,7 +315,7 @@ struct fc_plogi_csp_s {
315 query_dbc:1, 315 query_dbc:1,
316 hg_supp:1; 316 hg_supp:1;
317#endif 317#endif
318 __be16 rxsz; /* recieve data_field size */ 318 __be16 rxsz; /* receive data_field size */
319 __be16 conseq; 319 __be16 conseq;
320 __be16 ro_bitmap; 320 __be16 ro_bitmap;
321 __be32 e_d_tov; 321 __be32 e_d_tov;
diff --git a/drivers/scsi/bfa/bfa_fcs.c b/drivers/scsi/bfa/bfa_fcs.c
index f674f9318629..9b43ca4b6778 100644
--- a/drivers/scsi/bfa/bfa_fcs.c
+++ b/drivers/scsi/bfa/bfa_fcs.c
@@ -1033,7 +1033,7 @@ bfa_fcs_fabric_delvport(struct bfa_fcs_fabric_s *fabric,
1033 1033
1034 1034
1035/* 1035/*
1036 * Lookup for a vport withing a fabric given its pwwn 1036 * Lookup for a vport within a fabric given its pwwn
1037 */ 1037 */
1038struct bfa_fcs_vport_s * 1038struct bfa_fcs_vport_s *
1039bfa_fcs_fabric_vport_lookup(struct bfa_fcs_fabric_s *fabric, wwn_t pwwn) 1039bfa_fcs_fabric_vport_lookup(struct bfa_fcs_fabric_s *fabric, wwn_t pwwn)
diff --git a/drivers/scsi/bfa/bfa_fcs.h b/drivers/scsi/bfa/bfa_fcs.h
index 0fd63168573f..61cdce4bd913 100644
--- a/drivers/scsi/bfa/bfa_fcs.h
+++ b/drivers/scsi/bfa/bfa_fcs.h
@@ -705,7 +705,7 @@ enum rport_event {
705 RPSM_EVENT_ADDRESS_CHANGE = 15, /* Rport's PID has changed */ 705 RPSM_EVENT_ADDRESS_CHANGE = 15, /* Rport's PID has changed */
706 RPSM_EVENT_ADDRESS_DISC = 16, /* Need to Discover rport's PID */ 706 RPSM_EVENT_ADDRESS_DISC = 16, /* Need to Discover rport's PID */
707 RPSM_EVENT_PRLO_RCVD = 17, /* PRLO from remote device */ 707 RPSM_EVENT_PRLO_RCVD = 17, /* PRLO from remote device */
708 RPSM_EVENT_PLOGI_RETRY = 18, /* Retry PLOGI continously */ 708 RPSM_EVENT_PLOGI_RETRY = 18, /* Retry PLOGI continuously */
709}; 709};
710 710
711/* 711/*
diff --git a/drivers/scsi/bfa/bfa_fcs_lport.c b/drivers/scsi/bfa/bfa_fcs_lport.c
index 43fa986bb586..1d6be8c14473 100644
--- a/drivers/scsi/bfa/bfa_fcs_lport.c
+++ b/drivers/scsi/bfa/bfa_fcs_lport.c
@@ -1149,7 +1149,7 @@ bfa_fcs_lport_fdmi_sm_offline(struct bfa_fcs_lport_fdmi_s *fdmi,
1149 } else { 1149 } else {
1150 /* 1150 /*
1151 * For a base port, we should first register the HBA 1151 * For a base port, we should first register the HBA
1152 * atribute. The HBA attribute also contains the base 1152 * attribute. The HBA attribute also contains the base
1153 * port registration. 1153 * port registration.
1154 */ 1154 */
1155 bfa_sm_set_state(fdmi, 1155 bfa_sm_set_state(fdmi,
diff --git a/drivers/scsi/bfa/bfa_svc.c b/drivers/scsi/bfa/bfa_svc.c
index 1d34921f88bf..16d9a5f61c18 100644
--- a/drivers/scsi/bfa/bfa_svc.c
+++ b/drivers/scsi/bfa/bfa_svc.c
@@ -1035,7 +1035,7 @@ bfa_fcxp_free(struct bfa_fcxp_s *fcxp)
1035 * @param[in] rport BFA rport pointer. Could be left NULL for WKA rports 1035 * @param[in] rport BFA rport pointer. Could be left NULL for WKA rports
1036 * @param[in] vf_id virtual Fabric ID 1036 * @param[in] vf_id virtual Fabric ID
1037 * @param[in] lp_tag lport tag 1037 * @param[in] lp_tag lport tag
1038 * @param[in] cts use Continous sequence 1038 * @param[in] cts use Continuous sequence
1039 * @param[in] cos fc Class of Service 1039 * @param[in] cos fc Class of Service
1040 * @param[in] reqlen request length, does not include FCHS length 1040 * @param[in] reqlen request length, does not include FCHS length
1041 * @param[in] fchs fc Header Pointer. The header content will be copied 1041 * @param[in] fchs fc Header Pointer. The header content will be copied
@@ -5022,7 +5022,7 @@ bfa_uf_start(struct bfa_s *bfa)
5022} 5022}
5023 5023
5024/* 5024/*
5025 * Register handler for all unsolicted recieve frames. 5025 * Register handler for all unsolicted receive frames.
5026 * 5026 *
5027 * @param[in] bfa BFA instance 5027 * @param[in] bfa BFA instance
5028 * @param[in] ufrecv receive handler function 5028 * @param[in] ufrecv receive handler function
diff --git a/drivers/scsi/bfa/bfa_svc.h b/drivers/scsi/bfa/bfa_svc.h
index 331ad992a581..5902a45c080f 100644
--- a/drivers/scsi/bfa/bfa_svc.h
+++ b/drivers/scsi/bfa/bfa_svc.h
@@ -127,7 +127,7 @@ struct bfa_fcxp_req_info_s {
127 * rport nexus is established 127 * rport nexus is established
128 */ 128 */
129 struct fchs_s fchs; /* request FC header structure */ 129 struct fchs_s fchs; /* request FC header structure */
130 u8 cts; /* continous sequence */ 130 u8 cts; /* continuous sequence */
131 u8 class; /* FC class for the request/response */ 131 u8 class; /* FC class for the request/response */
132 u16 max_frmsz; /* max send frame size */ 132 u16 max_frmsz; /* max send frame size */
133 u16 vf_id; /* vsan tag if applicable */ 133 u16 vf_id; /* vsan tag if applicable */
diff --git a/drivers/scsi/bfa/bfad.c b/drivers/scsi/bfa/bfad.c
index 44524cf55d33..0fd510a01561 100644
--- a/drivers/scsi/bfa/bfad.c
+++ b/drivers/scsi/bfa/bfad.c
@@ -1278,7 +1278,7 @@ bfad_setup_intr(struct bfad_s *bfad)
1278 * interrupts into one vector, so even if we 1278 * interrupts into one vector, so even if we
1279 * can try to request less vectors, we don't 1279 * can try to request less vectors, we don't
1280 * know how to associate interrupt events to 1280 * know how to associate interrupt events to
1281 * vectors. Linux doesn't dupicate vectors 1281 * vectors. Linux doesn't duplicate vectors
1282 * in the MSIX table for this case. 1282 * in the MSIX table for this case.
1283 */ 1283 */
1284 1284
diff --git a/drivers/scsi/bnx2fc/57xx_hsi_bnx2fc.h b/drivers/scsi/bnx2fc/57xx_hsi_bnx2fc.h
index 69d031d98469..97a61b4d81b7 100644
--- a/drivers/scsi/bnx2fc/57xx_hsi_bnx2fc.h
+++ b/drivers/scsi/bnx2fc/57xx_hsi_bnx2fc.h
@@ -898,7 +898,7 @@ struct fcoe_confqe {
898 898
899 899
900/* 900/*
901 * FCoE conection data base 901 * FCoE connection data base
902 */ 902 */
903struct fcoe_conn_db { 903struct fcoe_conn_db {
904#if defined(__BIG_ENDIAN) 904#if defined(__BIG_ENDIAN)
diff --git a/drivers/scsi/bnx2fc/bnx2fc_els.c b/drivers/scsi/bnx2fc/bnx2fc_els.c
index 7a11a255157f..52c358427ce2 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_els.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_els.c
@@ -397,7 +397,7 @@ void bnx2fc_process_els_compl(struct bnx2fc_cmd *els_req,
397 &els_req->req_flags)) { 397 &els_req->req_flags)) {
398 BNX2FC_ELS_DBG("Timer context finished processing this " 398 BNX2FC_ELS_DBG("Timer context finished processing this "
399 "els - 0x%x\n", els_req->xid); 399 "els - 0x%x\n", els_req->xid);
400 /* This IO doesnt receive cleanup completion */ 400 /* This IO doesn't receive cleanup completion */
401 kref_put(&els_req->refcount, bnx2fc_cmd_release); 401 kref_put(&els_req->refcount, bnx2fc_cmd_release);
402 return; 402 return;
403 } 403 }
diff --git a/drivers/scsi/bnx2fc/bnx2fc_io.c b/drivers/scsi/bnx2fc/bnx2fc_io.c
index d3fc302c241a..1decefbf32e3 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_io.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_io.c
@@ -1273,7 +1273,7 @@ static void bnx2fc_lun_reset_cmpl(struct bnx2fc_cmd *io_req)
1273 bnx2fc_cmd_release); 1273 bnx2fc_cmd_release);
1274 /* timer hold */ 1274 /* timer hold */
1275 rc = bnx2fc_initiate_abts(cmd); 1275 rc = bnx2fc_initiate_abts(cmd);
1276 /* abts shouldnt fail in this context */ 1276 /* abts shouldn't fail in this context */
1277 WARN_ON(rc != SUCCESS); 1277 WARN_ON(rc != SUCCESS);
1278 } else 1278 } else
1279 printk(KERN_ERR PFX "lun_rst: abts already in" 1279 printk(KERN_ERR PFX "lun_rst: abts already in"
@@ -1308,7 +1308,7 @@ static void bnx2fc_tgt_reset_cmpl(struct bnx2fc_cmd *io_req)
1308 kref_put(&io_req->refcount, 1308 kref_put(&io_req->refcount,
1309 bnx2fc_cmd_release); /* timer hold */ 1309 bnx2fc_cmd_release); /* timer hold */
1310 rc = bnx2fc_initiate_abts(cmd); 1310 rc = bnx2fc_initiate_abts(cmd);
1311 /* abts shouldnt fail in this context */ 1311 /* abts shouldn't fail in this context */
1312 WARN_ON(rc != SUCCESS); 1312 WARN_ON(rc != SUCCESS);
1313 1313
1314 } else 1314 } else
diff --git a/drivers/scsi/bnx2fc/bnx2fc_tgt.c b/drivers/scsi/bnx2fc/bnx2fc_tgt.c
index 7cc05e4e82d5..a2e3830bd268 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_tgt.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_tgt.c
@@ -395,7 +395,7 @@ void bnx2fc_rport_event_handler(struct fc_lport *lport,
395 rp = rport->dd_data; 395 rp = rport->dd_data;
396 if (rport->port_id == FC_FID_DIR_SERV) { 396 if (rport->port_id == FC_FID_DIR_SERV) {
397 /* 397 /*
398 * bnx2fc_rport structure doesnt exist for 398 * bnx2fc_rport structure doesn't exist for
399 * directory server. 399 * directory server.
400 * We should not come here, as lport will 400 * We should not come here, as lport will
401 * take care of fabric login 401 * take care of fabric login
diff --git a/drivers/scsi/bnx2i/bnx2i_hwi.c b/drivers/scsi/bnx2i/bnx2i_hwi.c
index 1da34c019b8a..f0b89513faed 100644
--- a/drivers/scsi/bnx2i/bnx2i_hwi.c
+++ b/drivers/scsi/bnx2i/bnx2i_hwi.c
@@ -173,7 +173,7 @@ void bnx2i_arm_cq_event_coalescing(struct bnx2i_endpoint *ep, u8 action)
173 173
174/** 174/**
175 * bnx2i_get_rq_buf - copy RQ buffer contents to driver buffer 175 * bnx2i_get_rq_buf - copy RQ buffer contents to driver buffer
176 * @conn: iscsi connection on which RQ event occured 176 * @conn: iscsi connection on which RQ event occurred
177 * @ptr: driver buffer to which RQ buffer contents is to 177 * @ptr: driver buffer to which RQ buffer contents is to
178 * be copied 178 * be copied
179 * @len: length of valid data inside RQ buf 179 * @len: length of valid data inside RQ buf
diff --git a/drivers/scsi/cxgbi/libcxgbi.h b/drivers/scsi/cxgbi/libcxgbi.h
index 0a20fd5f7102..9267844519c9 100644
--- a/drivers/scsi/cxgbi/libcxgbi.h
+++ b/drivers/scsi/cxgbi/libcxgbi.h
@@ -262,9 +262,9 @@ struct cxgbi_skb_tx_cb {
262enum cxgbi_skcb_flags { 262enum cxgbi_skcb_flags {
263 SKCBF_TX_NEED_HDR, /* packet needs a header */ 263 SKCBF_TX_NEED_HDR, /* packet needs a header */
264 SKCBF_RX_COALESCED, /* received whole pdu */ 264 SKCBF_RX_COALESCED, /* received whole pdu */
265 SKCBF_RX_HDR, /* recieved pdu header */ 265 SKCBF_RX_HDR, /* received pdu header */
266 SKCBF_RX_DATA, /* recieved pdu payload */ 266 SKCBF_RX_DATA, /* received pdu payload */
267 SKCBF_RX_STATUS, /* recieved ddp status */ 267 SKCBF_RX_STATUS, /* received ddp status */
268 SKCBF_RX_DATA_DDPD, /* pdu payload ddp'd */ 268 SKCBF_RX_DATA_DDPD, /* pdu payload ddp'd */
269 SKCBF_RX_HCRC_ERR, /* header digest error */ 269 SKCBF_RX_HCRC_ERR, /* header digest error */
270 SKCBF_RX_DCRC_ERR, /* data digest error */ 270 SKCBF_RX_DCRC_ERR, /* data digest error */
diff --git a/drivers/scsi/dc395x.c b/drivers/scsi/dc395x.c
index b0f8523e665f..b10b3841535c 100644
--- a/drivers/scsi/dc395x.c
+++ b/drivers/scsi/dc395x.c
@@ -235,7 +235,7 @@ struct ScsiReqBlk {
235 235
236 u8 sg_count; /* No of HW sg entries for this request */ 236 u8 sg_count; /* No of HW sg entries for this request */
237 u8 sg_index; /* Index of HW sg entry for this request */ 237 u8 sg_index; /* Index of HW sg entry for this request */
238 size_t total_xfer_length; /* Total number of bytes remaining to be transfered */ 238 size_t total_xfer_length; /* Total number of bytes remaining to be transferred */
239 size_t request_length; /* Total number of bytes in this request */ 239 size_t request_length; /* Total number of bytes in this request */
240 /* 240 /*
241 * The sense buffer handling function, request_sense, uses 241 * The sense buffer handling function, request_sense, uses
@@ -1774,7 +1774,7 @@ static void dc395x_handle_interrupt(struct AdapterCtlBlk *acb,
1774 dc395x_statev(acb, srb, &scsi_status); 1774 dc395x_statev(acb, srb, &scsi_status);
1775 1775
1776 /* 1776 /*
1777 * if there were any exception occured scsi_status 1777 * if there were any exception occurred scsi_status
1778 * will be modify to bus free phase new scsi_status 1778 * will be modify to bus free phase new scsi_status
1779 * transfer out from ... previous dc395x_statev 1779 * transfer out from ... previous dc395x_statev
1780 */ 1780 */
@@ -1954,11 +1954,11 @@ static void sg_verify_length(struct ScsiReqBlk *srb)
1954static void sg_update_list(struct ScsiReqBlk *srb, u32 left) 1954static void sg_update_list(struct ScsiReqBlk *srb, u32 left)
1955{ 1955{
1956 u8 idx; 1956 u8 idx;
1957 u32 xferred = srb->total_xfer_length - left; /* bytes transfered */ 1957 u32 xferred = srb->total_xfer_length - left; /* bytes transferred */
1958 struct SGentry *psge = srb->segment_x + srb->sg_index; 1958 struct SGentry *psge = srb->segment_x + srb->sg_index;
1959 1959
1960 dprintkdbg(DBG_0, 1960 dprintkdbg(DBG_0,
1961 "sg_update_list: Transfered %i of %i bytes, %i remain\n", 1961 "sg_update_list: Transferred %i of %i bytes, %i remain\n",
1962 xferred, srb->total_xfer_length, left); 1962 xferred, srb->total_xfer_length, left);
1963 if (xferred == 0) { 1963 if (xferred == 0) {
1964 /* nothing to update since we did not transfer any data */ 1964 /* nothing to update since we did not transfer any data */
@@ -1990,7 +1990,7 @@ static void sg_update_list(struct ScsiReqBlk *srb, u32 left)
1990 1990
1991 1991
1992/* 1992/*
1993 * We have transfered a single byte (PIO mode?) and need to update 1993 * We have transferred a single byte (PIO mode?) and need to update
1994 * the count of bytes remaining (total_xfer_length) and update the sg 1994 * the count of bytes remaining (total_xfer_length) and update the sg
1995 * entry to either point to next byte in the current sg entry, or of 1995 * entry to either point to next byte in the current sg entry, or of
1996 * already at the end to point to the start of the next sg entry 1996 * already at the end to point to the start of the next sg entry
@@ -2029,7 +2029,7 @@ static void cleanup_after_transfer(struct AdapterCtlBlk *acb,
2029 2029
2030 2030
2031/* 2031/*
2032 * Those no of bytes will be transfered w/ PIO through the SCSI FIFO 2032 * Those no of bytes will be transferred w/ PIO through the SCSI FIFO
2033 * Seems to be needed for unknown reasons; could be a hardware bug :-( 2033 * Seems to be needed for unknown reasons; could be a hardware bug :-(
2034 */ 2034 */
2035#define DC395x_LASTPIO 4 2035#define DC395x_LASTPIO 4
@@ -2256,7 +2256,7 @@ static void data_in_phase0(struct AdapterCtlBlk *acb, struct ScsiReqBlk *srb,
2256 DC395x_read32(acb, TRM_S1040_DMA_CXCNT), 2256 DC395x_read32(acb, TRM_S1040_DMA_CXCNT),
2257 srb->total_xfer_length, d_left_counter); 2257 srb->total_xfer_length, d_left_counter);
2258#if DC395x_LASTPIO 2258#if DC395x_LASTPIO
2259 /* KG: Less than or equal to 4 bytes can not be transfered via DMA, it seems. */ 2259 /* KG: Less than or equal to 4 bytes can not be transferred via DMA, it seems. */
2260 if (d_left_counter 2260 if (d_left_counter
2261 && srb->total_xfer_length <= DC395x_LASTPIO) { 2261 && srb->total_xfer_length <= DC395x_LASTPIO) {
2262 size_t left_io = srb->total_xfer_length; 2262 size_t left_io = srb->total_xfer_length;
diff --git a/drivers/scsi/dc395x.h b/drivers/scsi/dc395x.h
index b38360e5fe4f..fbf35e37701e 100644
--- a/drivers/scsi/dc395x.h
+++ b/drivers/scsi/dc395x.h
@@ -617,7 +617,7 @@ struct ScsiInqData
617#define NTC_DO_SEND_START 0x08 /* Send start command SPINUP */ 617#define NTC_DO_SEND_START 0x08 /* Send start command SPINUP */
618#define NTC_DO_DISCONNECT 0x04 /* Enable SCSI disconnect */ 618#define NTC_DO_DISCONNECT 0x04 /* Enable SCSI disconnect */
619#define NTC_DO_SYNC_NEGO 0x02 /* Sync negotiation */ 619#define NTC_DO_SYNC_NEGO 0x02 /* Sync negotiation */
620#define NTC_DO_PARITY_CHK 0x01 /* (it sould define at NAC) */ 620#define NTC_DO_PARITY_CHK 0x01 /* (it should define at NAC) */
621 /* Parity check enable */ 621 /* Parity check enable */
622 622
623/************************************************************************/ 623/************************************************************************/
diff --git a/drivers/scsi/device_handler/scsi_dh_alua.c b/drivers/scsi/device_handler/scsi_dh_alua.c
index 7cae0bc85390..42fe52902add 100644
--- a/drivers/scsi/device_handler/scsi_dh_alua.c
+++ b/drivers/scsi/device_handler/scsi_dh_alua.c
@@ -541,7 +541,7 @@ static int alua_check_sense(struct scsi_device *sdev,
541 * 541 *
542 * Evaluate the Target Port Group State. 542 * Evaluate the Target Port Group State.
543 * Returns SCSI_DH_DEV_OFFLINED if the path is 543 * Returns SCSI_DH_DEV_OFFLINED if the path is
544 * found to be unuseable. 544 * found to be unusable.
545 */ 545 */
546static int alua_rtpg(struct scsi_device *sdev, struct alua_dh_data *h) 546static int alua_rtpg(struct scsi_device *sdev, struct alua_dh_data *h)
547{ 547{
@@ -620,7 +620,7 @@ static int alua_rtpg(struct scsi_device *sdev, struct alua_dh_data *h)
620 break; 620 break;
621 case TPGS_STATE_OFFLINE: 621 case TPGS_STATE_OFFLINE:
622 case TPGS_STATE_UNAVAILABLE: 622 case TPGS_STATE_UNAVAILABLE:
623 /* Path unuseable for unavailable/offline */ 623 /* Path unusable for unavailable/offline */
624 err = SCSI_DH_DEV_OFFLINED; 624 err = SCSI_DH_DEV_OFFLINED;
625 break; 625 break;
626 default: 626 default:
diff --git a/drivers/scsi/dpt/sys_info.h b/drivers/scsi/dpt/sys_info.h
index a90c4cb8ea8b..a4aa1c31ff72 100644
--- a/drivers/scsi/dpt/sys_info.h
+++ b/drivers/scsi/dpt/sys_info.h
@@ -79,9 +79,9 @@
79 typedef struct { 79 typedef struct {
80#endif 80#endif
81 81
82 uSHORT cylinders; /* Upto 1024 */ 82 uSHORT cylinders; /* Up to 1024 */
83 uCHAR heads; /* Upto 255 */ 83 uCHAR heads; /* Up to 255 */
84 uCHAR sectors; /* Upto 63 */ 84 uCHAR sectors; /* Up to 63 */
85 85
86#ifdef __cplusplus 86#ifdef __cplusplus
87 87
diff --git a/drivers/scsi/eata.c b/drivers/scsi/eata.c
index 53925ac178fd..0eb4fe6a4c8a 100644
--- a/drivers/scsi/eata.c
+++ b/drivers/scsi/eata.c
@@ -63,7 +63,7 @@
63 * ep:[y|n] eisa_probe=[1|0] CONFIG_EISA defined 63 * ep:[y|n] eisa_probe=[1|0] CONFIG_EISA defined
64 * pp:[y|n] pci_probe=[1|0] CONFIG_PCI defined 64 * pp:[y|n] pci_probe=[1|0] CONFIG_PCI defined
65 * 65 *
66 * The default action is to perform probing if the corrisponding 66 * The default action is to perform probing if the corresponding
67 * bus is configured and to skip probing otherwise. 67 * bus is configured and to skip probing otherwise.
68 * 68 *
69 * + If pci_probe is in effect and a list of I/O ports is specified 69 * + If pci_probe is in effect and a list of I/O ports is specified
diff --git a/drivers/scsi/fcoe/fcoe_ctlr.c b/drivers/scsi/fcoe/fcoe_ctlr.c
index c93f007e702f..9d38be2a41f9 100644
--- a/drivers/scsi/fcoe/fcoe_ctlr.c
+++ b/drivers/scsi/fcoe/fcoe_ctlr.c
@@ -656,7 +656,7 @@ int fcoe_ctlr_els_send(struct fcoe_ctlr *fip, struct fc_lport *lport,
656 * If non-FIP, we may have gotten an SID by accepting an FLOGI 656 * If non-FIP, we may have gotten an SID by accepting an FLOGI
657 * from a point-to-point connection. Switch to using 657 * from a point-to-point connection. Switch to using
658 * the source mac based on the SID. The destination 658 * the source mac based on the SID. The destination
659 * MAC in this case would have been set by receving the 659 * MAC in this case would have been set by receiving the
660 * FLOGI. 660 * FLOGI.
661 */ 661 */
662 if (fip->state == FIP_ST_NON_FIP) { 662 if (fip->state == FIP_ST_NON_FIP) {
@@ -1876,7 +1876,7 @@ static void fcoe_ctlr_vn_send(struct fcoe_ctlr *fip,
1876 * fcoe_ctlr_vn_rport_callback - Event handler for rport events. 1876 * fcoe_ctlr_vn_rport_callback - Event handler for rport events.
1877 * @lport: The lport which is receiving the event 1877 * @lport: The lport which is receiving the event
1878 * @rdata: remote port private data 1878 * @rdata: remote port private data
1879 * @event: The event that occured 1879 * @event: The event that occurred
1880 * 1880 *
1881 * Locking Note: The rport lock must not be held when calling this function. 1881 * Locking Note: The rport lock must not be held when calling this function.
1882 */ 1882 */
diff --git a/drivers/scsi/fdomain.c b/drivers/scsi/fdomain.c
index 69b7aa54f43f..643f6d500fe7 100644
--- a/drivers/scsi/fdomain.c
+++ b/drivers/scsi/fdomain.c
@@ -174,7 +174,7 @@
174 Future Domain sold DOS BIOS source for $250 and the UN*X driver source was 174 Future Domain sold DOS BIOS source for $250 and the UN*X driver source was
175 $750, but these required a non-disclosure agreement, so even if I could 175 $750, but these required a non-disclosure agreement, so even if I could
176 have afforded them, they would *not* have been useful for writing this 176 have afforded them, they would *not* have been useful for writing this
177 publically distributable driver. Future Domain technical support has 177 publicly distributable driver. Future Domain technical support has
178 provided some information on the phone and have sent a few useful FAXs. 178 provided some information on the phone and have sent a few useful FAXs.
179 They have been much more helpful since they started to recognize that the 179 They have been much more helpful since they started to recognize that the
180 word "Linux" refers to an operating system :-). 180 word "Linux" refers to an operating system :-).
diff --git a/drivers/scsi/fnic/fnic_fcs.c b/drivers/scsi/fnic/fnic_fcs.c
index 2b48d79bad94..3c53c3478ee7 100644
--- a/drivers/scsi/fnic/fnic_fcs.c
+++ b/drivers/scsi/fnic/fnic_fcs.c
@@ -411,7 +411,7 @@ int fnic_rq_cmpl_handler(struct fnic *fnic, int rq_work_to_do)
411 err = vnic_rq_fill(&fnic->rq[i], fnic_alloc_rq_frame); 411 err = vnic_rq_fill(&fnic->rq[i], fnic_alloc_rq_frame);
412 if (err) 412 if (err)
413 shost_printk(KERN_ERR, fnic->lport->host, 413 shost_printk(KERN_ERR, fnic->lport->host,
414 "fnic_alloc_rq_frame cant alloc" 414 "fnic_alloc_rq_frame can't alloc"
415 " frame\n"); 415 " frame\n");
416 } 416 }
417 tot_rq_work_done += cur_work_done; 417 tot_rq_work_done += cur_work_done;
diff --git a/drivers/scsi/fnic/fnic_scsi.c b/drivers/scsi/fnic/fnic_scsi.c
index 22d02404d15f..538b31c2cf58 100644
--- a/drivers/scsi/fnic/fnic_scsi.c
+++ b/drivers/scsi/fnic/fnic_scsi.c
@@ -1123,7 +1123,7 @@ void fnic_rport_exch_reset(struct fnic *fnic, u32 port_id)
1123 fc_lun.scsi_lun, io_req)) { 1123 fc_lun.scsi_lun, io_req)) {
1124 /* 1124 /*
1125 * Revert the cmd state back to old state, if 1125 * Revert the cmd state back to old state, if
1126 * it hasnt changed in between. This cmd will get 1126 * it hasn't changed in between. This cmd will get
1127 * aborted later by scsi_eh, or cleaned up during 1127 * aborted later by scsi_eh, or cleaned up during
1128 * lun reset 1128 * lun reset
1129 */ 1129 */
@@ -1208,7 +1208,7 @@ void fnic_terminate_rport_io(struct fc_rport *rport)
1208 fc_lun.scsi_lun, io_req)) { 1208 fc_lun.scsi_lun, io_req)) {
1209 /* 1209 /*
1210 * Revert the cmd state back to old state, if 1210 * Revert the cmd state back to old state, if
1211 * it hasnt changed in between. This cmd will get 1211 * it hasn't changed in between. This cmd will get
1212 * aborted later by scsi_eh, or cleaned up during 1212 * aborted later by scsi_eh, or cleaned up during
1213 * lun reset 1213 * lun reset
1214 */ 1214 */
diff --git a/drivers/scsi/g_NCR5380.c b/drivers/scsi/g_NCR5380.c
index 427a56d3117e..81182badfeb1 100644
--- a/drivers/scsi/g_NCR5380.c
+++ b/drivers/scsi/g_NCR5380.c
@@ -566,7 +566,7 @@ generic_NCR5380_biosparam(struct scsi_device *sdev, struct block_device *bdev,
566 * @dst: buffer to read into 566 * @dst: buffer to read into
567 * @len: buffer length 567 * @len: buffer length
568 * 568 *
569 * Perform a psuedo DMA mode read from an NCR53C400 or equivalent 569 * Perform a pseudo DMA mode read from an NCR53C400 or equivalent
570 * controller 570 * controller
571 */ 571 */
572 572
@@ -650,7 +650,7 @@ static inline int NCR5380_pread(struct Scsi_Host *instance, unsigned char *dst,
650 * @dst: buffer to read into 650 * @dst: buffer to read into
651 * @len: buffer length 651 * @len: buffer length
652 * 652 *
653 * Perform a psuedo DMA mode read from an NCR53C400 or equivalent 653 * Perform a pseudo DMA mode read from an NCR53C400 or equivalent
654 * controller 654 * controller
655 */ 655 */
656 656
diff --git a/drivers/scsi/gdth.h b/drivers/scsi/gdth.h
index 120a0625a7b5..d969855ac64a 100644
--- a/drivers/scsi/gdth.h
+++ b/drivers/scsi/gdth.h
@@ -895,7 +895,7 @@ typedef struct {
895 u8 ldr_no; /* log. drive no. */ 895 u8 ldr_no; /* log. drive no. */
896 u8 rw_attribs; /* r/w attributes */ 896 u8 rw_attribs; /* r/w attributes */
897 u8 cluster_type; /* cluster properties */ 897 u8 cluster_type; /* cluster properties */
898 u8 media_changed; /* Flag:MOUNT/UNMOUNT occured */ 898 u8 media_changed; /* Flag:MOUNT/UNMOUNT occurred */
899 u32 start_sec; /* start sector */ 899 u32 start_sec; /* start sector */
900 } hdr[MAX_LDRIVES]; /* host drives */ 900 } hdr[MAX_LDRIVES]; /* host drives */
901 struct { 901 struct {
diff --git a/drivers/scsi/gvp11.c b/drivers/scsi/gvp11.c
index 2ce26eb7a1ec..50bb54150a78 100644
--- a/drivers/scsi/gvp11.c
+++ b/drivers/scsi/gvp11.c
@@ -300,7 +300,7 @@ static int __devinit gvp11_probe(struct zorro_dev *z,
300 /* 300 /*
301 * Rumors state that some GVP ram boards use the same product 301 * Rumors state that some GVP ram boards use the same product
302 * code as the SCSI controllers. Therefore if the board-size 302 * code as the SCSI controllers. Therefore if the board-size
303 * is not 64KB we asume it is a ram board and bail out. 303 * is not 64KB we assume it is a ram board and bail out.
304 */ 304 */
305 if (zorro_resource_len(z) != 0x10000) 305 if (zorro_resource_len(z) != 0x10000)
306 return -ENODEV; 306 return -ENODEV;
diff --git a/drivers/scsi/imm.c b/drivers/scsi/imm.c
index 99aa0e5699bc..26cd9d1d7571 100644
--- a/drivers/scsi/imm.c
+++ b/drivers/scsi/imm.c
@@ -3,7 +3,7 @@
3 * 3 *
4 * (The IMM is the embedded controller in the ZIP Plus drive.) 4 * (The IMM is the embedded controller in the ZIP Plus drive.)
5 * 5 *
6 * My unoffical company acronym list is 21 pages long: 6 * My unofficial company acronym list is 21 pages long:
7 * FLA: Four letter acronym with built in facility for 7 * FLA: Four letter acronym with built in facility for
8 * future expansion to five letters. 8 * future expansion to five letters.
9 */ 9 */
diff --git a/drivers/scsi/initio.c b/drivers/scsi/initio.c
index 9627d062e16b..dd741bcd6ccd 100644
--- a/drivers/scsi/initio.c
+++ b/drivers/scsi/initio.c
@@ -242,7 +242,7 @@ static u8 i91udftNvRam[64] =
242 242
243static u8 initio_rate_tbl[8] = /* fast 20 */ 243static u8 initio_rate_tbl[8] = /* fast 20 */
244{ 244{
245 /* nanosecond devide by 4 */ 245 /* nanosecond divide by 4 */
246 12, /* 50ns, 20M */ 246 12, /* 50ns, 20M */
247 18, /* 75ns, 13.3M */ 247 18, /* 75ns, 13.3M */
248 25, /* 100ns, 10M */ 248 25, /* 100ns, 10M */
@@ -1917,7 +1917,7 @@ static int int_initio_scsi_rst(struct initio_host * host)
1917} 1917}
1918 1918
1919/** 1919/**
1920 * int_initio_scsi_resel - Reselection occured 1920 * int_initio_scsi_resel - Reselection occurred
1921 * @host: InitIO host adapter 1921 * @host: InitIO host adapter
1922 * 1922 *
1923 * A SCSI reselection event has been signalled and the interrupt 1923 * A SCSI reselection event has been signalled and the interrupt
diff --git a/drivers/scsi/initio.h b/drivers/scsi/initio.h
index e58af9e95506..219b901bdc25 100644
--- a/drivers/scsi/initio.h
+++ b/drivers/scsi/initio.h
@@ -116,7 +116,7 @@ typedef struct {
116#define TUL_SBusId 0x89 /* 09 R SCSI BUS ID */ 116#define TUL_SBusId 0x89 /* 09 R SCSI BUS ID */
117#define TUL_STimeOut 0x8A /* 0A W Sel/Resel Time Out Register */ 117#define TUL_STimeOut 0x8A /* 0A W Sel/Resel Time Out Register */
118#define TUL_SIdent 0x8A /* 0A R Identify Message Register */ 118#define TUL_SIdent 0x8A /* 0A R Identify Message Register */
119#define TUL_SAvail 0x8A /* 0A R Availiable Counter Register */ 119#define TUL_SAvail 0x8A /* 0A R Available Counter Register */
120#define TUL_SData 0x8B /* 0B R/W SCSI data in/out */ 120#define TUL_SData 0x8B /* 0B R/W SCSI data in/out */
121#define TUL_SFifo 0x8C /* 0C R/W FIFO */ 121#define TUL_SFifo 0x8C /* 0C R/W FIFO */
122#define TUL_SSignal 0x90 /* 10 R/W SCSI signal in/out */ 122#define TUL_SSignal 0x90 /* 10 R/W SCSI signal in/out */
@@ -389,7 +389,7 @@ struct scsi_ctrl_blk {
389/* Bit Definition for status */ 389/* Bit Definition for status */
390#define SCB_RENT 0x01 390#define SCB_RENT 0x01
391#define SCB_PEND 0x02 391#define SCB_PEND 0x02
392#define SCB_CONTIG 0x04 /* Contigent Allegiance */ 392#define SCB_CONTIG 0x04 /* Contingent Allegiance */
393#define SCB_SELECT 0x08 393#define SCB_SELECT 0x08
394#define SCB_BUSY 0x10 394#define SCB_BUSY 0x10
395#define SCB_DONE 0x20 395#define SCB_DONE 0x20
diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c
index b2511acd39bd..218f71a8726e 100644
--- a/drivers/scsi/ips.c
+++ b/drivers/scsi/ips.c
@@ -137,7 +137,7 @@
137/* - Fix path/name for scsi_hosts.h include for 2.6 kernels */ 137/* - Fix path/name for scsi_hosts.h include for 2.6 kernels */
138/* - Fix sort order of 7k */ 138/* - Fix sort order of 7k */
139/* - Remove 3 unused "inline" functions */ 139/* - Remove 3 unused "inline" functions */
140/* 7.12.xx - Use STATIC functions whereever possible */ 140/* 7.12.xx - Use STATIC functions wherever possible */
141/* - Clean up deprecated MODULE_PARM calls */ 141/* - Clean up deprecated MODULE_PARM calls */
142/* 7.12.05 - Remove Version Matching per IBM request */ 142/* 7.12.05 - Remove Version Matching per IBM request */
143/*****************************************************************************/ 143/*****************************************************************************/
@@ -1665,7 +1665,7 @@ ips_flash_copperhead(ips_ha_t * ha, ips_passthru_t * pt, ips_scb_t * scb)
1665 int datasize; 1665 int datasize;
1666 1666
1667 /* Trombone is the only copperhead that can do packet flash, but only 1667 /* Trombone is the only copperhead that can do packet flash, but only
1668 * for firmware. No one said it had to make sence. */ 1668 * for firmware. No one said it had to make sense. */
1669 if (IPS_IS_TROMBONE(ha) && pt->CoppCP.cmd.flashfw.type == IPS_FW_IMAGE) { 1669 if (IPS_IS_TROMBONE(ha) && pt->CoppCP.cmd.flashfw.type == IPS_FW_IMAGE) {
1670 if (ips_usrcmd(ha, pt, scb)) 1670 if (ips_usrcmd(ha, pt, scb))
1671 return IPS_SUCCESS; 1671 return IPS_SUCCESS;
diff --git a/drivers/scsi/ips.h b/drivers/scsi/ips.h
index 4e49fbcfe8af..f2df0593332b 100644
--- a/drivers/scsi/ips.h
+++ b/drivers/scsi/ips.h
@@ -1193,7 +1193,7 @@ typedef struct {
1193#define IPS_VER_SEBRING "7.12.02" 1193#define IPS_VER_SEBRING "7.12.02"
1194#define IPS_VER_KEYWEST "7.12.02" 1194#define IPS_VER_KEYWEST "7.12.02"
1195 1195
1196/* Compatability IDs for various adapters */ 1196/* Compatibility IDs for various adapters */
1197#define IPS_COMPAT_UNKNOWN "" 1197#define IPS_COMPAT_UNKNOWN ""
1198#define IPS_COMPAT_CURRENT "KW710" 1198#define IPS_COMPAT_CURRENT "KW710"
1199#define IPS_COMPAT_SERVERAID1 "2.25.01" 1199#define IPS_COMPAT_SERVERAID1 "2.25.01"
diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c
index a860452a8f71..3df985305f69 100644
--- a/drivers/scsi/iscsi_tcp.c
+++ b/drivers/scsi/iscsi_tcp.c
@@ -295,7 +295,7 @@ static int iscsi_sw_tcp_xmit(struct iscsi_conn *conn)
295 rc = iscsi_sw_tcp_xmit_segment(tcp_conn, segment); 295 rc = iscsi_sw_tcp_xmit_segment(tcp_conn, segment);
296 /* 296 /*
297 * We may not have been able to send data because the conn 297 * We may not have been able to send data because the conn
298 * is getting stopped. libiscsi will know so propogate err 298 * is getting stopped. libiscsi will know so propagate err
299 * for it to do the right thing. 299 * for it to do the right thing.
300 */ 300 */
301 if (rc == -EAGAIN) 301 if (rc == -EAGAIN)
diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c
index 28231badd9e6..77035a746f60 100644
--- a/drivers/scsi/libfc/fc_exch.c
+++ b/drivers/scsi/libfc/fc_exch.c
@@ -1042,7 +1042,7 @@ static void fc_exch_set_addr(struct fc_exch *ep,
1042} 1042}
1043 1043
1044/** 1044/**
1045 * fc_seq_els_rsp_send() - Send an ELS response using infomation from 1045 * fc_seq_els_rsp_send() - Send an ELS response using information from
1046 * the existing sequence/exchange. 1046 * the existing sequence/exchange.
1047 * @fp: The received frame 1047 * @fp: The received frame
1048 * @els_cmd: The ELS command to be sent 1048 * @els_cmd: The ELS command to be sent
@@ -1153,7 +1153,7 @@ static void fc_seq_send_ack(struct fc_seq *sp, const struct fc_frame *rx_fp)
1153 * fc_exch_send_ba_rjt() - Send BLS Reject 1153 * fc_exch_send_ba_rjt() - Send BLS Reject
1154 * @rx_fp: The frame being rejected 1154 * @rx_fp: The frame being rejected
1155 * @reason: The reason the frame is being rejected 1155 * @reason: The reason the frame is being rejected
1156 * @explan: The explaination for the rejection 1156 * @explan: The explanation for the rejection
1157 * 1157 *
1158 * This is for rejecting BA_ABTS only. 1158 * This is for rejecting BA_ABTS only.
1159 */ 1159 */
diff --git a/drivers/scsi/libfc/fc_fcp.c b/drivers/scsi/libfc/fc_fcp.c
index b1b03af158bf..5b799a37ad09 100644
--- a/drivers/scsi/libfc/fc_fcp.c
+++ b/drivers/scsi/libfc/fc_fcp.c
@@ -870,7 +870,7 @@ static void fc_fcp_resp(struct fc_fcp_pkt *fsp, struct fc_frame *fp)
870 fsp->scsi_resid = ntohl(rp_ex->fr_resid); 870 fsp->scsi_resid = ntohl(rp_ex->fr_resid);
871 /* 871 /*
872 * The cmnd->underflow is the minimum number of 872 * The cmnd->underflow is the minimum number of
873 * bytes that must be transfered for this 873 * bytes that must be transferred for this
874 * command. Provided a sense condition is not 874 * command. Provided a sense condition is not
875 * present, make sure the actual amount 875 * present, make sure the actual amount
876 * transferred is at least the underflow value 876 * transferred is at least the underflow value
@@ -1306,7 +1306,7 @@ static int fc_lun_reset(struct fc_lport *lport, struct fc_fcp_pkt *fsp,
1306} 1306}
1307 1307
1308/** 1308/**
1309 * fc_tm_done() - Task Managment response handler 1309 * fc_tm_done() - Task Management response handler
1310 * @seq: The sequence that the response is on 1310 * @seq: The sequence that the response is on
1311 * @fp: The response frame 1311 * @fp: The response frame
1312 * @arg: The FCP packet the response is for 1312 * @arg: The FCP packet the response is for
diff --git a/drivers/scsi/libfc/fc_lport.c b/drivers/scsi/libfc/fc_lport.c
index 8c08b210001d..906bbcad0e2d 100644
--- a/drivers/scsi/libfc/fc_lport.c
+++ b/drivers/scsi/libfc/fc_lport.c
@@ -52,7 +52,7 @@
52 * while making the callback. To ensure that the rport is not free'd while 52 * while making the callback. To ensure that the rport is not free'd while
53 * processing the callback the rport callbacks are serialized through a 53 * processing the callback the rport callbacks are serialized through a
54 * single-threaded workqueue. An rport would never be free'd while in a 54 * single-threaded workqueue. An rport would never be free'd while in a
55 * callback handler becuase no other rport work in this queue can be executed 55 * callback handler because no other rport work in this queue can be executed
56 * at the same time. 56 * at the same time.
57 * 57 *
58 * When discovery succeeds or fails a callback is made to the lport as 58 * When discovery succeeds or fails a callback is made to the lport as
@@ -163,7 +163,7 @@ static int fc_frame_drop(struct fc_lport *lport, struct fc_frame *fp)
163 * fc_lport_rport_callback() - Event handler for rport events 163 * fc_lport_rport_callback() - Event handler for rport events
164 * @lport: The lport which is receiving the event 164 * @lport: The lport which is receiving the event
165 * @rdata: private remote port data 165 * @rdata: private remote port data
166 * @event: The event that occured 166 * @event: The event that occurred
167 * 167 *
168 * Locking Note: The rport lock should not be held when calling 168 * Locking Note: The rport lock should not be held when calling
169 * this function. 169 * this function.
@@ -379,7 +379,7 @@ static void fc_lport_add_fc4_type(struct fc_lport *lport, enum fc_fh_type type)
379 379
380/** 380/**
381 * fc_lport_recv_rlir_req() - Handle received Registered Link Incident Report. 381 * fc_lport_recv_rlir_req() - Handle received Registered Link Incident Report.
382 * @lport: Fibre Channel local port recieving the RLIR 382 * @lport: Fibre Channel local port receiving the RLIR
383 * @fp: The RLIR request frame 383 * @fp: The RLIR request frame
384 * 384 *
385 * Locking Note: The lport lock is expected to be held before calling 385 * Locking Note: The lport lock is expected to be held before calling
@@ -396,7 +396,7 @@ static void fc_lport_recv_rlir_req(struct fc_lport *lport, struct fc_frame *fp)
396 396
397/** 397/**
398 * fc_lport_recv_echo_req() - Handle received ECHO request 398 * fc_lport_recv_echo_req() - Handle received ECHO request
399 * @lport: The local port recieving the ECHO 399 * @lport: The local port receiving the ECHO
400 * @fp: ECHO request frame 400 * @fp: ECHO request frame
401 * 401 *
402 * Locking Note: The lport lock is expected to be held before calling 402 * Locking Note: The lport lock is expected to be held before calling
@@ -432,7 +432,7 @@ static void fc_lport_recv_echo_req(struct fc_lport *lport,
432 432
433/** 433/**
434 * fc_lport_recv_rnid_req() - Handle received Request Node ID data request 434 * fc_lport_recv_rnid_req() - Handle received Request Node ID data request
435 * @lport: The local port recieving the RNID 435 * @lport: The local port receiving the RNID
436 * @fp: The RNID request frame 436 * @fp: The RNID request frame
437 * 437 *
438 * Locking Note: The lport lock is expected to be held before calling 438 * Locking Note: The lport lock is expected to be held before calling
@@ -491,7 +491,7 @@ static void fc_lport_recv_rnid_req(struct fc_lport *lport,
491 491
492/** 492/**
493 * fc_lport_recv_logo_req() - Handle received fabric LOGO request 493 * fc_lport_recv_logo_req() - Handle received fabric LOGO request
494 * @lport: The local port recieving the LOGO 494 * @lport: The local port receiving the LOGO
495 * @fp: The LOGO request frame 495 * @fp: The LOGO request frame
496 * 496 *
497 * Locking Note: The lport lock is exected to be held before calling 497 * Locking Note: The lport lock is exected to be held before calling
@@ -771,7 +771,7 @@ EXPORT_SYMBOL(fc_lport_set_local_id);
771 771
772/** 772/**
773 * fc_lport_recv_flogi_req() - Receive a FLOGI request 773 * fc_lport_recv_flogi_req() - Receive a FLOGI request
774 * @lport: The local port that recieved the request 774 * @lport: The local port that received the request
775 * @rx_fp: The FLOGI frame 775 * @rx_fp: The FLOGI frame
776 * 776 *
777 * A received FLOGI request indicates a point-to-point connection. 777 * A received FLOGI request indicates a point-to-point connection.
@@ -858,7 +858,7 @@ out:
858 * if an rport should handle the request. 858 * if an rport should handle the request.
859 * 859 *
860 * Locking Note: This function should not be called with the lport 860 * Locking Note: This function should not be called with the lport
861 * lock held becuase it will grab the lock. 861 * lock held because it will grab the lock.
862 */ 862 */
863static void fc_lport_recv_els_req(struct fc_lport *lport, 863static void fc_lport_recv_els_req(struct fc_lport *lport,
864 struct fc_frame *fp) 864 struct fc_frame *fp)
@@ -925,7 +925,7 @@ struct fc4_prov fc_lport_els_prov = {
925 * @fp: The frame the request is in 925 * @fp: The frame the request is in
926 * 926 *
927 * Locking Note: This function should not be called with the lport 927 * Locking Note: This function should not be called with the lport
928 * lock held becuase it may grab the lock. 928 * lock held because it may grab the lock.
929 */ 929 */
930static void fc_lport_recv_req(struct fc_lport *lport, 930static void fc_lport_recv_req(struct fc_lport *lport,
931 struct fc_frame *fp) 931 struct fc_frame *fp)
diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c
index f3f693b772ac..874e29d9533f 100644
--- a/drivers/scsi/libsas/sas_expander.c
+++ b/drivers/scsi/libsas/sas_expander.c
@@ -240,7 +240,7 @@ static int sas_ex_phy_discover_helper(struct domain_device *dev, u8 *disc_req,
240 disc_resp, DISCOVER_RESP_SIZE); 240 disc_resp, DISCOVER_RESP_SIZE);
241 if (res) 241 if (res)
242 return res; 242 return res;
243 /* This is detecting a failure to transmit inital 243 /* This is detecting a failure to transmit initial
244 * dev to host FIS as described in section G.5 of 244 * dev to host FIS as described in section G.5 of
245 * sas-2 r 04b */ 245 * sas-2 r 04b */
246 dr = &((struct smp_resp *)disc_resp)->disc; 246 dr = &((struct smp_resp *)disc_resp)->disc;
diff --git a/drivers/scsi/lpfc/lpfc_attr.c b/drivers/scsi/lpfc/lpfc_attr.c
index 4e0faa00b96f..17d789325f40 100644
--- a/drivers/scsi/lpfc/lpfc_attr.c
+++ b/drivers/scsi/lpfc/lpfc_attr.c
@@ -4515,7 +4515,7 @@ static FC_RPORT_ATTR(field, S_IRUGO, lpfc_show_rport_##field, NULL)
4515 * Description: 4515 * Description:
4516 * This function is called by the transport after the @fc_vport's symbolic name 4516 * This function is called by the transport after the @fc_vport's symbolic name
4517 * has been changed. This function re-registers the symbolic name with the 4517 * has been changed. This function re-registers the symbolic name with the
4518 * switch to propogate the change into the fabric if the vport is active. 4518 * switch to propagate the change into the fabric if the vport is active.
4519 **/ 4519 **/
4520static void 4520static void
4521lpfc_set_vport_symbolic_name(struct fc_vport *fc_vport) 4521lpfc_set_vport_symbolic_name(struct fc_vport *fc_vport)
diff --git a/drivers/scsi/lpfc/lpfc_bsg.c b/drivers/scsi/lpfc/lpfc_bsg.c
index 793b9f1131fb..77b2871d96b7 100644
--- a/drivers/scsi/lpfc/lpfc_bsg.c
+++ b/drivers/scsi/lpfc/lpfc_bsg.c
@@ -1939,7 +1939,7 @@ out:
1939 * @rxxri: Receive exchange id 1939 * @rxxri: Receive exchange id
1940 * @len: Number of data bytes 1940 * @len: Number of data bytes
1941 * 1941 *
1942 * This function allocates and posts a data buffer of sufficient size to recieve 1942 * This function allocates and posts a data buffer of sufficient size to receive
1943 * an unsolicted CT command. 1943 * an unsolicted CT command.
1944 **/ 1944 **/
1945static int lpfcdiag_loop_post_rxbufs(struct lpfc_hba *phba, uint16_t rxxri, 1945static int lpfcdiag_loop_post_rxbufs(struct lpfc_hba *phba, uint16_t rxxri,
diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c
index a753581509d6..3d967741c708 100644
--- a/drivers/scsi/lpfc/lpfc_debugfs.c
+++ b/drivers/scsi/lpfc/lpfc_debugfs.c
@@ -908,7 +908,7 @@ lpfc_debugfs_dumpData_open(struct inode *inode, struct file *file)
908 if (!debug) 908 if (!debug)
909 goto out; 909 goto out;
910 910
911 /* Round to page boundry */ 911 /* Round to page boundary */
912 printk(KERN_ERR "9059 BLKGRD: %s: _dump_buf_data=0x%p\n", 912 printk(KERN_ERR "9059 BLKGRD: %s: _dump_buf_data=0x%p\n",
913 __func__, _dump_buf_data); 913 __func__, _dump_buf_data);
914 debug->buffer = _dump_buf_data; 914 debug->buffer = _dump_buf_data;
@@ -938,7 +938,7 @@ lpfc_debugfs_dumpDif_open(struct inode *inode, struct file *file)
938 if (!debug) 938 if (!debug)
939 goto out; 939 goto out;
940 940
941 /* Round to page boundry */ 941 /* Round to page boundary */
942 printk(KERN_ERR "9060 BLKGRD: %s: _dump_buf_dif=0x%p file=%s\n", 942 printk(KERN_ERR "9060 BLKGRD: %s: _dump_buf_dif=0x%p file=%s\n",
943 __func__, _dump_buf_dif, file->f_dentry->d_name.name); 943 __func__, _dump_buf_dif, file->f_dentry->d_name.name);
944 debug->buffer = _dump_buf_dif; 944 debug->buffer = _dump_buf_dif;
@@ -2158,7 +2158,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
2158 debugfs_create_dir(name, phba->hba_debugfs_root); 2158 debugfs_create_dir(name, phba->hba_debugfs_root);
2159 if (!vport->vport_debugfs_root) { 2159 if (!vport->vport_debugfs_root) {
2160 lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT, 2160 lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,
2161 "0417 Cant create debugfs\n"); 2161 "0417 Can't create debugfs\n");
2162 goto debug_failed; 2162 goto debug_failed;
2163 } 2163 }
2164 atomic_inc(&phba->debugfs_vport_count); 2164 atomic_inc(&phba->debugfs_vport_count);
@@ -2211,7 +2211,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
2211 vport, &lpfc_debugfs_op_nodelist); 2211 vport, &lpfc_debugfs_op_nodelist);
2212 if (!vport->debug_nodelist) { 2212 if (!vport->debug_nodelist) {
2213 lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT, 2213 lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,
2214 "0409 Cant create debugfs nodelist\n"); 2214 "0409 Can't create debugfs nodelist\n");
2215 goto debug_failed; 2215 goto debug_failed;
2216 } 2216 }
2217 2217
diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c
index 735028fedda5..d34b69f9cdb1 100644
--- a/drivers/scsi/lpfc/lpfc_els.c
+++ b/drivers/scsi/lpfc/lpfc_els.c
@@ -102,7 +102,7 @@ lpfc_els_chk_latt(struct lpfc_vport *vport)
102 phba->pport->port_state); 102 phba->pport->port_state);
103 103
104 /* CLEAR_LA should re-enable link attention events and 104 /* CLEAR_LA should re-enable link attention events and
105 * we should then imediately take a LATT event. The 105 * we should then immediately take a LATT event. The
106 * LATT processing should call lpfc_linkdown() which 106 * LATT processing should call lpfc_linkdown() which
107 * will cleanup any left over in-progress discovery 107 * will cleanup any left over in-progress discovery
108 * events. 108 * events.
@@ -1599,7 +1599,7 @@ out:
1599 * This routine is the completion callback function for issuing the Port 1599 * This routine is the completion callback function for issuing the Port
1600 * Login (PLOGI) command. For PLOGI completion, there must be an active 1600 * Login (PLOGI) command. For PLOGI completion, there must be an active
1601 * ndlp on the vport node list that matches the remote node ID from the 1601 * ndlp on the vport node list that matches the remote node ID from the
1602 * PLOGI reponse IOCB. If such ndlp does not exist, the PLOGI is simply 1602 * PLOGI response IOCB. If such ndlp does not exist, the PLOGI is simply
1603 * ignored and command IOCB released. The PLOGI response IOCB status is 1603 * ignored and command IOCB released. The PLOGI response IOCB status is
1604 * checked for error conditons. If there is error status reported, PLOGI 1604 * checked for error conditons. If there is error status reported, PLOGI
1605 * retry shall be attempted by invoking the lpfc_els_retry() routine. 1605 * retry shall be attempted by invoking the lpfc_els_retry() routine.
diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c
index 154c715fb3af..301498301a8f 100644
--- a/drivers/scsi/lpfc/lpfc_hbadisc.c
+++ b/drivers/scsi/lpfc/lpfc_hbadisc.c
@@ -739,7 +739,7 @@ lpfc_do_work(void *p)
739 739
740/* 740/*
741 * This is only called to handle FC worker events. Since this a rare 741 * This is only called to handle FC worker events. Since this a rare
742 * occurance, we allocate a struct lpfc_work_evt structure here instead of 742 * occurrence, we allocate a struct lpfc_work_evt structure here instead of
743 * embedding it in the IOCB. 743 * embedding it in the IOCB.
744 */ 744 */
745int 745int
@@ -1348,7 +1348,7 @@ lpfc_register_fcf(struct lpfc_hba *phba)
1348 int rc; 1348 int rc;
1349 1349
1350 spin_lock_irq(&phba->hbalock); 1350 spin_lock_irq(&phba->hbalock);
1351 /* If the FCF is not availabe do nothing. */ 1351 /* If the FCF is not available do nothing. */
1352 if (!(phba->fcf.fcf_flag & FCF_AVAILABLE)) { 1352 if (!(phba->fcf.fcf_flag & FCF_AVAILABLE)) {
1353 phba->hba_flag &= ~(FCF_TS_INPROG | FCF_RR_INPROG); 1353 phba->hba_flag &= ~(FCF_TS_INPROG | FCF_RR_INPROG);
1354 spin_unlock_irq(&phba->hbalock); 1354 spin_unlock_irq(&phba->hbalock);
@@ -1538,7 +1538,7 @@ lpfc_match_fcf_conn_list(struct lpfc_hba *phba,
1538 1538
1539 /* 1539 /*
1540 * If user did not specify any addressing mode, or if the 1540 * If user did not specify any addressing mode, or if the
1541 * prefered addressing mode specified by user is not supported 1541 * preferred addressing mode specified by user is not supported
1542 * by FCF, allow fabric to pick the addressing mode. 1542 * by FCF, allow fabric to pick the addressing mode.
1543 */ 1543 */
1544 *addr_mode = bf_get(lpfc_fcf_record_mac_addr_prov, 1544 *addr_mode = bf_get(lpfc_fcf_record_mac_addr_prov,
@@ -1553,7 +1553,7 @@ lpfc_match_fcf_conn_list(struct lpfc_hba *phba,
1553 FCFCNCT_AM_SPMA) ? 1553 FCFCNCT_AM_SPMA) ?
1554 LPFC_FCF_SPMA : LPFC_FCF_FPMA; 1554 LPFC_FCF_SPMA : LPFC_FCF_FPMA;
1555 /* 1555 /*
1556 * If the user specified a prefered address mode, use the 1556 * If the user specified a preferred address mode, use the
1557 * addr mode only if FCF support the addr_mode. 1557 * addr mode only if FCF support the addr_mode.
1558 */ 1558 */
1559 else if ((conn_entry->conn_rec.flags & FCFCNCT_AM_VALID) && 1559 else if ((conn_entry->conn_rec.flags & FCFCNCT_AM_VALID) &&
@@ -3117,7 +3117,7 @@ lpfc_mbx_cmpl_reg_login(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
3117 * back at reg login state so this 3117 * back at reg login state so this
3118 * mbox needs to be ignored becase 3118 * mbox needs to be ignored becase
3119 * there is another reg login in 3119 * there is another reg login in
3120 * proccess. 3120 * process.
3121 */ 3121 */
3122 spin_lock_irq(shost->host_lock); 3122 spin_lock_irq(shost->host_lock);
3123 ndlp->nlp_flag &= ~NLP_IGNR_REG_CMPL; 3123 ndlp->nlp_flag &= ~NLP_IGNR_REG_CMPL;
@@ -4477,7 +4477,7 @@ lpfc_setup_disc_node(struct lpfc_vport *vport, uint32_t did)
4477 if ((vport->fc_flag & FC_RSCN_MODE) && 4477 if ((vport->fc_flag & FC_RSCN_MODE) &&
4478 !(vport->fc_flag & FC_NDISC_ACTIVE)) { 4478 !(vport->fc_flag & FC_NDISC_ACTIVE)) {
4479 if (lpfc_rscn_payload_check(vport, did)) { 4479 if (lpfc_rscn_payload_check(vport, did)) {
4480 /* If we've already recieved a PLOGI from this NPort 4480 /* If we've already received a PLOGI from this NPort
4481 * we don't need to try to discover it again. 4481 * we don't need to try to discover it again.
4482 */ 4482 */
4483 if (ndlp->nlp_flag & NLP_RCV_PLOGI) 4483 if (ndlp->nlp_flag & NLP_RCV_PLOGI)
@@ -4493,7 +4493,7 @@ lpfc_setup_disc_node(struct lpfc_vport *vport, uint32_t did)
4493 } else 4493 } else
4494 ndlp = NULL; 4494 ndlp = NULL;
4495 } else { 4495 } else {
4496 /* If we've already recieved a PLOGI from this NPort, 4496 /* If we've already received a PLOGI from this NPort,
4497 * or we are already in the process of discovery on it, 4497 * or we are already in the process of discovery on it,
4498 * we don't need to try to discover it again. 4498 * we don't need to try to discover it again.
4499 */ 4499 */
@@ -5756,7 +5756,7 @@ lpfc_read_fcoe_param(struct lpfc_hba *phba,
5756 * @size: Size of the data buffer. 5756 * @size: Size of the data buffer.
5757 * @rec_type: Record type to be searched. 5757 * @rec_type: Record type to be searched.
5758 * 5758 *
5759 * This function searches config region data to find the begining 5759 * This function searches config region data to find the beginning
5760 * of the record specified by record_type. If record found, this 5760 * of the record specified by record_type. If record found, this
5761 * function return pointer to the record else return NULL. 5761 * function return pointer to the record else return NULL.
5762 */ 5762 */
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index e6ebe516cfbb..505f88443b5c 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -4466,7 +4466,7 @@ lpfc_sli4_driver_resource_unset(struct lpfc_hba *phba)
4466} 4466}
4467 4467
4468/** 4468/**
4469 * lpfc_init_api_table_setup - Set up init api fucntion jump table 4469 * lpfc_init_api_table_setup - Set up init api function jump table
4470 * @phba: The hba struct for which this call is being executed. 4470 * @phba: The hba struct for which this call is being executed.
4471 * @dev_grp: The HBA PCI-Device group number. 4471 * @dev_grp: The HBA PCI-Device group number.
4472 * 4472 *
@@ -4850,7 +4850,7 @@ out_free_mem:
4850 * 4850 *
4851 * Return codes 4851 * Return codes
4852 * 0 - successful 4852 * 0 - successful
4853 * -ENOMEM - No availble memory 4853 * -ENOMEM - No available memory
4854 * -EIO - The mailbox failed to complete successfully. 4854 * -EIO - The mailbox failed to complete successfully.
4855 **/ 4855 **/
4856int 4856int
@@ -5730,7 +5730,7 @@ lpfc_destroy_bootstrap_mbox(struct lpfc_hba *phba)
5730 * 5730 *
5731 * Return codes 5731 * Return codes
5732 * 0 - successful 5732 * 0 - successful
5733 * -ENOMEM - No availble memory 5733 * -ENOMEM - No available memory
5734 * -EIO - The mailbox failed to complete successfully. 5734 * -EIO - The mailbox failed to complete successfully.
5735 **/ 5735 **/
5736static int 5736static int
@@ -5835,7 +5835,7 @@ lpfc_sli4_read_config(struct lpfc_hba *phba)
5835 * 5835 *
5836 * Return codes 5836 * Return codes
5837 * 0 - successful 5837 * 0 - successful
5838 * -ENOMEM - No availble memory 5838 * -ENOMEM - No available memory
5839 * -EIO - The mailbox failed to complete successfully. 5839 * -EIO - The mailbox failed to complete successfully.
5840 **/ 5840 **/
5841static int 5841static int
@@ -5894,7 +5894,7 @@ lpfc_setup_endian_order(struct lpfc_hba *phba)
5894 * 5894 *
5895 * Return codes 5895 * Return codes
5896 * 0 - successful 5896 * 0 - successful
5897 * -ENOMEM - No availble memory 5897 * -ENOMEM - No available memory
5898 * -EIO - The mailbox failed to complete successfully. 5898 * -EIO - The mailbox failed to complete successfully.
5899 **/ 5899 **/
5900static int 5900static int
@@ -6189,7 +6189,7 @@ out_error:
6189 * 6189 *
6190 * Return codes 6190 * Return codes
6191 * 0 - successful 6191 * 0 - successful
6192 * -ENOMEM - No availble memory 6192 * -ENOMEM - No available memory
6193 * -EIO - The mailbox failed to complete successfully. 6193 * -EIO - The mailbox failed to complete successfully.
6194 **/ 6194 **/
6195static void 6195static void
@@ -6253,7 +6253,7 @@ lpfc_sli4_queue_destroy(struct lpfc_hba *phba)
6253 * 6253 *
6254 * Return codes 6254 * Return codes
6255 * 0 - successful 6255 * 0 - successful
6256 * -ENOMEM - No availble memory 6256 * -ENOMEM - No available memory
6257 * -EIO - The mailbox failed to complete successfully. 6257 * -EIO - The mailbox failed to complete successfully.
6258 **/ 6258 **/
6259int 6259int
@@ -6498,7 +6498,7 @@ out_error:
6498 * 6498 *
6499 * Return codes 6499 * Return codes
6500 * 0 - successful 6500 * 0 - successful
6501 * -ENOMEM - No availble memory 6501 * -ENOMEM - No available memory
6502 * -EIO - The mailbox failed to complete successfully. 6502 * -EIO - The mailbox failed to complete successfully.
6503 **/ 6503 **/
6504void 6504void
@@ -6543,7 +6543,7 @@ lpfc_sli4_queue_unset(struct lpfc_hba *phba)
6543 * 6543 *
6544 * Return codes 6544 * Return codes
6545 * 0 - successful 6545 * 0 - successful
6546 * -ENOMEM - No availble memory 6546 * -ENOMEM - No available memory
6547 **/ 6547 **/
6548static int 6548static int
6549lpfc_sli4_cq_event_pool_create(struct lpfc_hba *phba) 6549lpfc_sli4_cq_event_pool_create(struct lpfc_hba *phba)
@@ -6704,7 +6704,7 @@ lpfc_sli4_cq_event_release_all(struct lpfc_hba *phba)
6704 * 6704 *
6705 * Return codes 6705 * Return codes
6706 * 0 - successful 6706 * 0 - successful
6707 * -ENOMEM - No availble memory 6707 * -ENOMEM - No available memory
6708 * -EIO - The mailbox failed to complete successfully. 6708 * -EIO - The mailbox failed to complete successfully.
6709 **/ 6709 **/
6710int 6710int
diff --git a/drivers/scsi/lpfc/lpfc_mbox.c b/drivers/scsi/lpfc/lpfc_mbox.c
index dba32dfdb59b..fbab9734e9b4 100644
--- a/drivers/scsi/lpfc/lpfc_mbox.c
+++ b/drivers/scsi/lpfc/lpfc_mbox.c
@@ -1834,7 +1834,7 @@ lpfc_sli4_mbox_opcode_get(struct lpfc_hba *phba, struct lpfcMboxq *mbox)
1834 * @fcf_index: index to fcf table. 1834 * @fcf_index: index to fcf table.
1835 * 1835 *
1836 * This routine routine allocates and constructs non-embedded mailbox command 1836 * This routine routine allocates and constructs non-embedded mailbox command
1837 * for reading a FCF table entry refered by @fcf_index. 1837 * for reading a FCF table entry referred by @fcf_index.
1838 * 1838 *
1839 * Return: pointer to the mailbox command constructed if successful, otherwise 1839 * Return: pointer to the mailbox command constructed if successful, otherwise
1840 * NULL. 1840 * NULL.
diff --git a/drivers/scsi/lpfc/lpfc_nl.h b/drivers/scsi/lpfc/lpfc_nl.h
index f3cfbe2ce986..f2b1bbcb196f 100644
--- a/drivers/scsi/lpfc/lpfc_nl.h
+++ b/drivers/scsi/lpfc/lpfc_nl.h
@@ -50,7 +50,7 @@
50 * and subcategory. The event type must come first. 50 * and subcategory. The event type must come first.
51 * The subcategory further defines the data that follows in the rest 51 * The subcategory further defines the data that follows in the rest
52 * of the payload. Each category will have its own unique header plus 52 * of the payload. Each category will have its own unique header plus
53 * any addtional data unique to the subcategory. 53 * any additional data unique to the subcategory.
54 * The payload sent via the fc transport is one-way driver->application. 54 * The payload sent via the fc transport is one-way driver->application.
55 */ 55 */
56 56
diff --git a/drivers/scsi/lpfc/lpfc_nportdisc.c b/drivers/scsi/lpfc/lpfc_nportdisc.c
index 52b35159fc35..0d92d4205ea6 100644
--- a/drivers/scsi/lpfc/lpfc_nportdisc.c
+++ b/drivers/scsi/lpfc/lpfc_nportdisc.c
@@ -658,7 +658,7 @@ lpfc_disc_set_adisc(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)
658 return 0; 658 return 0;
659} 659}
660/** 660/**
661 * lpfc_release_rpi - Release a RPI by issueing unreg_login mailbox cmd. 661 * lpfc_release_rpi - Release a RPI by issuing unreg_login mailbox cmd.
662 * @phba : Pointer to lpfc_hba structure. 662 * @phba : Pointer to lpfc_hba structure.
663 * @vport: Pointer to lpfc_vport structure. 663 * @vport: Pointer to lpfc_vport structure.
664 * @rpi : rpi to be release. 664 * @rpi : rpi to be release.
diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
index 2b962b020cfb..fe7cc84e773b 100644
--- a/drivers/scsi/lpfc/lpfc_scsi.c
+++ b/drivers/scsi/lpfc/lpfc_scsi.c
@@ -577,7 +577,7 @@ lpfc_new_scsi_buf_s3(struct lpfc_vport *vport, int num_to_alloc)
577 iocb->un.fcpi64.bdl.addrHigh = 0; 577 iocb->un.fcpi64.bdl.addrHigh = 0;
578 iocb->ulpBdeCount = 0; 578 iocb->ulpBdeCount = 0;
579 iocb->ulpLe = 0; 579 iocb->ulpLe = 0;
580 /* fill in responce BDE */ 580 /* fill in response BDE */
581 iocb->unsli3.fcp_ext.rbde.tus.f.bdeFlags = 581 iocb->unsli3.fcp_ext.rbde.tus.f.bdeFlags =
582 BUFF_TYPE_BDE_64; 582 BUFF_TYPE_BDE_64;
583 iocb->unsli3.fcp_ext.rbde.tus.f.bdeSize = 583 iocb->unsli3.fcp_ext.rbde.tus.f.bdeSize =
@@ -1217,10 +1217,10 @@ lpfc_scsi_prep_dma_buf_s3(struct lpfc_hba *phba, struct lpfc_scsi_buf *lpfc_cmd)
1217 (2 * sizeof(struct ulp_bde64))); 1217 (2 * sizeof(struct ulp_bde64)));
1218 data_bde->addrHigh = putPaddrHigh(physaddr); 1218 data_bde->addrHigh = putPaddrHigh(physaddr);
1219 data_bde->addrLow = putPaddrLow(physaddr); 1219 data_bde->addrLow = putPaddrLow(physaddr);
1220 /* ebde count includes the responce bde and data bpl */ 1220 /* ebde count includes the response bde and data bpl */
1221 iocb_cmd->unsli3.fcp_ext.ebde_count = 2; 1221 iocb_cmd->unsli3.fcp_ext.ebde_count = 2;
1222 } else { 1222 } else {
1223 /* ebde count includes the responce bde and data bdes */ 1223 /* ebde count includes the response bde and data bdes */
1224 iocb_cmd->unsli3.fcp_ext.ebde_count = (num_bde + 1); 1224 iocb_cmd->unsli3.fcp_ext.ebde_count = (num_bde + 1);
1225 } 1225 }
1226 } else { 1226 } else {
@@ -2380,7 +2380,7 @@ lpfc_handle_fcp_err(struct lpfc_vport *vport, struct lpfc_scsi_buf *lpfc_cmd,
2380 } 2380 }
2381 /* 2381 /*
2382 * The cmnd->underflow is the minimum number of bytes that must 2382 * The cmnd->underflow is the minimum number of bytes that must
2383 * be transfered for this command. Provided a sense condition 2383 * be transferred for this command. Provided a sense condition
2384 * is not present, make sure the actual amount transferred is at 2384 * is not present, make sure the actual amount transferred is at
2385 * least the underflow value or fail. 2385 * least the underflow value or fail.
2386 */ 2386 */
@@ -2873,7 +2873,7 @@ lpfc_scsi_prep_task_mgmt_cmd(struct lpfc_vport *vport,
2873} 2873}
2874 2874
2875/** 2875/**
2876 * lpfc_scsi_api_table_setup - Set up scsi api fucntion jump table 2876 * lpfc_scsi_api_table_setup - Set up scsi api function jump table
2877 * @phba: The hba struct for which this call is being executed. 2877 * @phba: The hba struct for which this call is being executed.
2878 * @dev_grp: The HBA PCI-Device group number. 2878 * @dev_grp: The HBA PCI-Device group number.
2879 * 2879 *
diff --git a/drivers/scsi/lpfc/lpfc_scsi.h b/drivers/scsi/lpfc/lpfc_scsi.h
index 5932273870a5..ce645b20a6ad 100644
--- a/drivers/scsi/lpfc/lpfc_scsi.h
+++ b/drivers/scsi/lpfc/lpfc_scsi.h
@@ -130,7 +130,7 @@ struct lpfc_scsi_buf {
130 dma_addr_t nonsg_phys; /* Non scatter-gather physical address. */ 130 dma_addr_t nonsg_phys; /* Non scatter-gather physical address. */
131 131
132 /* 132 /*
133 * data and dma_handle are the kernel virutal and bus address of the 133 * data and dma_handle are the kernel virtual and bus address of the
134 * dma-able buffer containing the fcp_cmd, fcp_rsp and a scatter 134 * dma-able buffer containing the fcp_cmd, fcp_rsp and a scatter
135 * gather bde list that supports the sg_tablesize value. 135 * gather bde list that supports the sg_tablesize value.
136 */ 136 */
diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
index 4746dcd756dd..dacabbe0a586 100644
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -2817,7 +2817,7 @@ void lpfc_poll_eratt(unsigned long ptr)
2817 * This function is called from the interrupt context when there is a ring 2817 * This function is called from the interrupt context when there is a ring
2818 * event for the fcp ring. The caller does not hold any lock. 2818 * event for the fcp ring. The caller does not hold any lock.
2819 * The function processes each response iocb in the response ring until it 2819 * The function processes each response iocb in the response ring until it
2820 * finds an iocb with LE bit set and chains all the iocbs upto the iocb with 2820 * finds an iocb with LE bit set and chains all the iocbs up to the iocb with
2821 * LE bit set. The function will call the completion handler of the command iocb 2821 * LE bit set. The function will call the completion handler of the command iocb
2822 * if the response iocb indicates a completion for a command iocb or it is 2822 * if the response iocb indicates a completion for a command iocb or it is
2823 * an abort completion. The function will call lpfc_sli_process_unsol_iocb 2823 * an abort completion. The function will call lpfc_sli_process_unsol_iocb
@@ -5117,7 +5117,7 @@ lpfc_mbox_timeout_handler(struct lpfc_hba *phba)
5117 5117
5118 /* Setting state unknown so lpfc_sli_abort_iocb_ring 5118 /* Setting state unknown so lpfc_sli_abort_iocb_ring
5119 * would get IOCB_ERROR from lpfc_sli_issue_iocb, allowing 5119 * would get IOCB_ERROR from lpfc_sli_issue_iocb, allowing
5120 * it to fail all oustanding SCSI IO. 5120 * it to fail all outstanding SCSI IO.
5121 */ 5121 */
5122 spin_lock_irq(&phba->pport->work_port_lock); 5122 spin_lock_irq(&phba->pport->work_port_lock);
5123 phba->pport->work_port_events &= ~WORKER_MBOX_TMO; 5123 phba->pport->work_port_events &= ~WORKER_MBOX_TMO;
@@ -6031,7 +6031,7 @@ lpfc_sli_issue_mbox(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmbox, uint32_t flag)
6031} 6031}
6032 6032
6033/** 6033/**
6034 * lpfc_mbox_api_table_setup - Set up mbox api fucntion jump table 6034 * lpfc_mbox_api_table_setup - Set up mbox api function jump table
6035 * @phba: The hba struct for which this call is being executed. 6035 * @phba: The hba struct for which this call is being executed.
6036 * @dev_grp: The HBA PCI-Device group number. 6036 * @dev_grp: The HBA PCI-Device group number.
6037 * 6037 *
@@ -6847,7 +6847,7 @@ __lpfc_sli_issue_iocb(struct lpfc_hba *phba, uint32_t ring_number,
6847} 6847}
6848 6848
6849/** 6849/**
6850 * lpfc_sli_api_table_setup - Set up sli api fucntion jump table 6850 * lpfc_sli_api_table_setup - Set up sli api function jump table
6851 * @phba: The hba struct for which this call is being executed. 6851 * @phba: The hba struct for which this call is being executed.
6852 * @dev_grp: The HBA PCI-Device group number. 6852 * @dev_grp: The HBA PCI-Device group number.
6853 * 6853 *
@@ -7521,7 +7521,7 @@ lpfc_sli_ring_taggedbuf_get(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
7521 struct lpfc_dmabuf *mp, *next_mp; 7521 struct lpfc_dmabuf *mp, *next_mp;
7522 struct list_head *slp = &pring->postbufq; 7522 struct list_head *slp = &pring->postbufq;
7523 7523
7524 /* Search postbufq, from the begining, looking for a match on tag */ 7524 /* Search postbufq, from the beginning, looking for a match on tag */
7525 spin_lock_irq(&phba->hbalock); 7525 spin_lock_irq(&phba->hbalock);
7526 list_for_each_entry_safe(mp, next_mp, &pring->postbufq, list) { 7526 list_for_each_entry_safe(mp, next_mp, &pring->postbufq, list) {
7527 if (mp->buffer_tag == tag) { 7527 if (mp->buffer_tag == tag) {
@@ -7565,7 +7565,7 @@ lpfc_sli_ringpostbuf_get(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
7565 struct lpfc_dmabuf *mp, *next_mp; 7565 struct lpfc_dmabuf *mp, *next_mp;
7566 struct list_head *slp = &pring->postbufq; 7566 struct list_head *slp = &pring->postbufq;
7567 7567
7568 /* Search postbufq, from the begining, looking for a match on phys */ 7568 /* Search postbufq, from the beginning, looking for a match on phys */
7569 spin_lock_irq(&phba->hbalock); 7569 spin_lock_irq(&phba->hbalock);
7570 list_for_each_entry_safe(mp, next_mp, &pring->postbufq, list) { 7570 list_for_each_entry_safe(mp, next_mp, &pring->postbufq, list) {
7571 if (mp->phys == phys) { 7571 if (mp->phys == phys) {
@@ -8438,7 +8438,7 @@ lpfc_sli_mbox_sys_shutdown(struct lpfc_hba *phba)
8438 * for possible error attention events. The caller must hold the hostlock 8438 * for possible error attention events. The caller must hold the hostlock
8439 * with spin_lock_irq(). 8439 * with spin_lock_irq().
8440 * 8440 *
8441 * This fucntion returns 1 when there is Error Attention in the Host Attention 8441 * This function returns 1 when there is Error Attention in the Host Attention
8442 * Register and returns 0 otherwise. 8442 * Register and returns 0 otherwise.
8443 **/ 8443 **/
8444static int 8444static int
@@ -8491,7 +8491,7 @@ unplug_err:
8491 * for possible error attention events. The caller must hold the hostlock 8491 * for possible error attention events. The caller must hold the hostlock
8492 * with spin_lock_irq(). 8492 * with spin_lock_irq().
8493 * 8493 *
8494 * This fucntion returns 1 when there is Error Attention in the Host Attention 8494 * This function returns 1 when there is Error Attention in the Host Attention
8495 * Register and returns 0 otherwise. 8495 * Register and returns 0 otherwise.
8496 **/ 8496 **/
8497static int 8497static int
@@ -8581,7 +8581,7 @@ lpfc_sli4_eratt_read(struct lpfc_hba *phba)
8581 * This function is called from timer soft interrupt context to check HBA's 8581 * This function is called from timer soft interrupt context to check HBA's
8582 * error attention register bit for error attention events. 8582 * error attention register bit for error attention events.
8583 * 8583 *
8584 * This fucntion returns 1 when there is Error Attention in the Host Attention 8584 * This function returns 1 when there is Error Attention in the Host Attention
8585 * Register and returns 0 otherwise. 8585 * Register and returns 0 otherwise.
8586 **/ 8586 **/
8587int 8587int
@@ -9684,7 +9684,7 @@ out:
9684 * @cq: Pointer to the completion queue. 9684 * @cq: Pointer to the completion queue.
9685 * @wcqe: Pointer to a completion queue entry. 9685 * @wcqe: Pointer to a completion queue entry.
9686 * 9686 *
9687 * This routine process a slow-path work-queue or recieve queue completion queue 9687 * This routine process a slow-path work-queue or receive queue completion queue
9688 * entry. 9688 * entry.
9689 * 9689 *
9690 * Return: true if work posted to worker thread, otherwise false. 9690 * Return: true if work posted to worker thread, otherwise false.
@@ -12971,7 +12971,7 @@ lpfc_sli4_build_dflt_fcf_record(struct lpfc_hba *phba,
12971 * record and processing it one at a time starting from the @fcf_index 12971 * record and processing it one at a time starting from the @fcf_index
12972 * for initial FCF discovery or fast FCF failover rediscovery. 12972 * for initial FCF discovery or fast FCF failover rediscovery.
12973 * 12973 *
12974 * Return 0 if the mailbox command is submitted sucessfully, none 0 12974 * Return 0 if the mailbox command is submitted successfully, none 0
12975 * otherwise. 12975 * otherwise.
12976 **/ 12976 **/
12977int 12977int
@@ -13032,7 +13032,7 @@ fail_fcf_scan:
13032 * This routine is invoked to read an FCF record indicated by @fcf_index 13032 * This routine is invoked to read an FCF record indicated by @fcf_index
13033 * and to use it for FLOGI roundrobin FCF failover. 13033 * and to use it for FLOGI roundrobin FCF failover.
13034 * 13034 *
13035 * Return 0 if the mailbox command is submitted sucessfully, none 0 13035 * Return 0 if the mailbox command is submitted successfully, none 0
13036 * otherwise. 13036 * otherwise.
13037 **/ 13037 **/
13038int 13038int
@@ -13078,7 +13078,7 @@ fail_fcf_read:
13078 * This routine is invoked to read an FCF record indicated by @fcf_index to 13078 * This routine is invoked to read an FCF record indicated by @fcf_index to
13079 * determine whether it's eligible for FLOGI roundrobin failover list. 13079 * determine whether it's eligible for FLOGI roundrobin failover list.
13080 * 13080 *
13081 * Return 0 if the mailbox command is submitted sucessfully, none 0 13081 * Return 0 if the mailbox command is submitted successfully, none 0
13082 * otherwise. 13082 * otherwise.
13083 **/ 13083 **/
13084int 13084int
diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c
index c212694a9714..f2684dd09ed0 100644
--- a/drivers/scsi/megaraid.c
+++ b/drivers/scsi/megaraid.c
@@ -284,7 +284,7 @@ mega_query_adapter(adapter_t *adapter)
284 284
285 adapter->host->max_id = 16; /* max targets per channel */ 285 adapter->host->max_id = 16; /* max targets per channel */
286 286
287 adapter->host->max_lun = 7; /* Upto 7 luns for non disk devices */ 287 adapter->host->max_lun = 7; /* Up to 7 luns for non disk devices */
288 288
289 adapter->host->cmd_per_lun = max_cmd_per_lun; 289 adapter->host->cmd_per_lun = max_cmd_per_lun;
290 290
@@ -3734,7 +3734,7 @@ mega_m_to_n(void __user *arg, nitioctl_t *uioc)
3734 * check is the application conforms to NIT. We do not have to do much 3734 * check is the application conforms to NIT. We do not have to do much
3735 * in that case. 3735 * in that case.
3736 * We exploit the fact that the signature is stored in the very 3736 * We exploit the fact that the signature is stored in the very
3737 * begining of the structure. 3737 * beginning of the structure.
3738 */ 3738 */
3739 3739
3740 if( copy_from_user(signature, arg, 7) ) 3740 if( copy_from_user(signature, arg, 7) )
diff --git a/drivers/scsi/megaraid.h b/drivers/scsi/megaraid.h
index 853411911b2e..9a7897f8ca43 100644
--- a/drivers/scsi/megaraid.h
+++ b/drivers/scsi/megaraid.h
@@ -532,9 +532,9 @@ struct uioctl_t {
532 532
533/* 533/*
534 * struct mcontroller is used to pass information about the controllers in the 534 * struct mcontroller is used to pass information about the controllers in the
535 * system. Its upto the application how to use the information. We are passing 535 * system. Its up to the application how to use the information. We are passing
536 * as much info about the cards as possible and useful. Before issuing the 536 * as much info about the cards as possible and useful. Before issuing the
537 * call to find information about the cards, the applicaiton needs to issue a 537 * call to find information about the cards, the application needs to issue a
538 * ioctl first to find out the number of controllers in the system. 538 * ioctl first to find out the number of controllers in the system.
539 */ 539 */
540#define MAX_CONTROLLERS 32 540#define MAX_CONTROLLERS 32
@@ -804,7 +804,7 @@ typedef struct {
804 unsigned long base; 804 unsigned long base;
805 void __iomem *mmio_base; 805 void __iomem *mmio_base;
806 806
807 /* mbox64 with mbox not aligned on 16-byte boundry */ 807 /* mbox64 with mbox not aligned on 16-byte boundary */
808 mbox64_t *una_mbox64; 808 mbox64_t *una_mbox64;
809 dma_addr_t una_mbox64_dma; 809 dma_addr_t una_mbox64_dma;
810 810
diff --git a/drivers/scsi/megaraid/mbox_defs.h b/drivers/scsi/megaraid/mbox_defs.h
index ce2487a888ed..e01c6f7c2cac 100644
--- a/drivers/scsi/megaraid/mbox_defs.h
+++ b/drivers/scsi/megaraid/mbox_defs.h
@@ -660,7 +660,7 @@ typedef struct {
660 * @lparam : logical drives parameters 660 * @lparam : logical drives parameters
661 * @span : span 661 * @span : span
662 * 662 *
663 * 8-LD logical drive with upto 8 spans 663 * 8-LD logical drive with up to 8 spans
664 */ 664 */
665typedef struct { 665typedef struct {
666 logdrv_param_t lparam; 666 logdrv_param_t lparam;
@@ -673,7 +673,7 @@ typedef struct {
673 * @lparam : logical drives parameters 673 * @lparam : logical drives parameters
674 * @span : span 674 * @span : span
675 * 675 *
676 * 8-LD logical drive with upto 4 spans 676 * 8-LD logical drive with up to 4 spans
677 */ 677 */
678typedef struct { 678typedef struct {
679 logdrv_param_t lparam; 679 logdrv_param_t lparam;
@@ -720,7 +720,7 @@ typedef struct {
720 * @ldrv : logical drives information 720 * @ldrv : logical drives information
721 * @pdrv : physical drives information 721 * @pdrv : physical drives information
722 * 722 *
723 * Disk array for 8LD logical drives with upto 8 spans 723 * Disk array for 8LD logical drives with up to 8 spans
724 */ 724 */
725typedef struct { 725typedef struct {
726 uint8_t numldrv; 726 uint8_t numldrv;
@@ -737,7 +737,7 @@ typedef struct {
737 * @ldrv : logical drives information 737 * @ldrv : logical drives information
738 * @pdrv : physical drives information 738 * @pdrv : physical drives information
739 * 739 *
740 * Disk array for 8LD logical drives with upto 4 spans 740 * Disk array for 8LD logical drives with up to 4 spans
741 */ 741 */
742typedef struct { 742typedef struct {
743 uint8_t numldrv; 743 uint8_t numldrv;
diff --git a/drivers/scsi/megaraid/megaraid_mbox.c b/drivers/scsi/megaraid/megaraid_mbox.c
index 5708cb27d078..1dba32870b4c 100644
--- a/drivers/scsi/megaraid/megaraid_mbox.c
+++ b/drivers/scsi/megaraid/megaraid_mbox.c
@@ -2689,7 +2689,7 @@ megaraid_reset_handler(struct scsi_cmnd *scp)
2689 (MBOX_RESET_WAIT + MBOX_RESET_EXT_WAIT) - i)); 2689 (MBOX_RESET_WAIT + MBOX_RESET_EXT_WAIT) - i));
2690 } 2690 }
2691 2691
2692 // bailout if no recovery happended in reset time 2692 // bailout if no recovery happened in reset time
2693 if (adapter->outstanding_cmds == 0) { 2693 if (adapter->outstanding_cmds == 0) {
2694 break; 2694 break;
2695 } 2695 }
@@ -3452,7 +3452,7 @@ megaraid_mbox_display_scb(adapter_t *adapter, scb_t *scb)
3452 * megaraid_mbox_setup_device_map - manage device ids 3452 * megaraid_mbox_setup_device_map - manage device ids
3453 * @adapter : Driver's soft state 3453 * @adapter : Driver's soft state
3454 * 3454 *
3455 * Manange the device ids to have an appropraite mapping between the kernel 3455 * Manange the device ids to have an appropriate mapping between the kernel
3456 * scsi addresses and megaraid scsi and logical drive addresses. We export 3456 * scsi addresses and megaraid scsi and logical drive addresses. We export
3457 * scsi devices on their actual addresses, whereas the logical drives are 3457 * scsi devices on their actual addresses, whereas the logical drives are
3458 * exported on a virtual scsi channel. 3458 * exported on a virtual scsi channel.
@@ -3973,7 +3973,7 @@ megaraid_sysfs_get_ldmap_timeout(unsigned long data)
3973 * NOTE: The commands issuance functionality is not generalized and 3973 * NOTE: The commands issuance functionality is not generalized and
3974 * implemented in context of "get ld map" command only. If required, the 3974 * implemented in context of "get ld map" command only. If required, the
3975 * command issuance logical can be trivially pulled out and implemented as a 3975 * command issuance logical can be trivially pulled out and implemented as a
3976 * standalone libary. For now, this should suffice since there is no other 3976 * standalone library. For now, this should suffice since there is no other
3977 * user of this interface. 3977 * user of this interface.
3978 * 3978 *
3979 * Return 0 on success. 3979 * Return 0 on success.
diff --git a/drivers/scsi/megaraid/megaraid_sas.h b/drivers/scsi/megaraid/megaraid_sas.h
index 635b228c3ead..046dcc672ec1 100644
--- a/drivers/scsi/megaraid/megaraid_sas.h
+++ b/drivers/scsi/megaraid/megaraid_sas.h
@@ -1347,7 +1347,7 @@ struct megasas_instance {
1347 struct timer_list io_completion_timer; 1347 struct timer_list io_completion_timer;
1348 struct list_head internal_reset_pending_q; 1348 struct list_head internal_reset_pending_q;
1349 1349
1350 /* Ptr to hba specfic information */ 1350 /* Ptr to hba specific information */
1351 void *ctrl_context; 1351 void *ctrl_context;
1352 u8 msi_flag; 1352 u8 msi_flag;
1353 struct msix_entry msixentry; 1353 struct msix_entry msixentry;
diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
index bbd10c81fd9c..66d4cea4df98 100644
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -1698,7 +1698,7 @@ void megasas_do_ocr(struct megasas_instance *instance)
1698 * megasas_wait_for_outstanding - Wait for all outstanding cmds 1698 * megasas_wait_for_outstanding - Wait for all outstanding cmds
1699 * @instance: Adapter soft state 1699 * @instance: Adapter soft state
1700 * 1700 *
1701 * This function waits for upto MEGASAS_RESET_WAIT_TIME seconds for FW to 1701 * This function waits for up to MEGASAS_RESET_WAIT_TIME seconds for FW to
1702 * complete all its outstanding commands. Returns error if one or more IOs 1702 * complete all its outstanding commands. Returns error if one or more IOs
1703 * are pending after this time period. It also marks the controller dead. 1703 * are pending after this time period. It also marks the controller dead.
1704 */ 1704 */
diff --git a/drivers/scsi/mpt2sas/mpi/mpi2_init.h b/drivers/scsi/mpt2sas/mpi/mpi2_init.h
index 20e6b8869341..165454d52591 100644
--- a/drivers/scsi/mpt2sas/mpi/mpi2_init.h
+++ b/drivers/scsi/mpt2sas/mpi/mpi2_init.h
@@ -21,7 +21,7 @@
21 * 05-21-08 02.00.05 Fixed typo in name of Mpi2SepRequest_t. 21 * 05-21-08 02.00.05 Fixed typo in name of Mpi2SepRequest_t.
22 * 10-02-08 02.00.06 Removed Untagged and No Disconnect values from SCSI IO 22 * 10-02-08 02.00.06 Removed Untagged and No Disconnect values from SCSI IO
23 * Control field Task Attribute flags. 23 * Control field Task Attribute flags.
24 * Moved LUN field defines to mpi2.h becasue they are 24 * Moved LUN field defines to mpi2.h because they are
25 * common to many structures. 25 * common to many structures.
26 * 05-06-09 02.00.07 Changed task management type of Query Unit Attention to 26 * 05-06-09 02.00.07 Changed task management type of Query Unit Attention to
27 * Query Asynchronous Event. 27 * Query Asynchronous Event.
diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.c b/drivers/scsi/mpt2sas/mpt2sas_base.c
index 5e001ffd4c13..3346357031e9 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_base.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_base.c
@@ -925,7 +925,7 @@ _base_interrupt(int irq, void *bus_id)
925} 925}
926 926
927/** 927/**
928 * mpt2sas_base_release_callback_handler - clear interupt callback handler 928 * mpt2sas_base_release_callback_handler - clear interrupt callback handler
929 * @cb_idx: callback index 929 * @cb_idx: callback index
930 * 930 *
931 * Return nothing. 931 * Return nothing.
@@ -1113,7 +1113,7 @@ _base_restore_msix_table(struct MPT2SAS_ADAPTER *ioc)
1113 * @ioc: per adapter object 1113 * @ioc: per adapter object
1114 * 1114 *
1115 * Check to see if card is capable of MSIX, and set number 1115 * Check to see if card is capable of MSIX, and set number
1116 * of avaliable msix vectors 1116 * of available msix vectors
1117 */ 1117 */
1118static int 1118static int
1119_base_check_enable_msix(struct MPT2SAS_ADAPTER *ioc) 1119_base_check_enable_msix(struct MPT2SAS_ADAPTER *ioc)
@@ -1595,7 +1595,7 @@ mpt2sas_base_put_smid_scsi_io(struct MPT2SAS_ADAPTER *ioc, u16 smid, u16 handle)
1595 1595
1596 1596
1597/** 1597/**
1598 * mpt2sas_base_put_smid_hi_priority - send Task Managment request to firmware 1598 * mpt2sas_base_put_smid_hi_priority - send Task Management request to firmware
1599 * @ioc: per adapter object 1599 * @ioc: per adapter object
1600 * @smid: system request message index 1600 * @smid: system request message index
1601 * 1601 *
@@ -2599,7 +2599,7 @@ _base_wait_for_doorbell_int(struct MPT2SAS_ADAPTER *ioc, int timeout,
2599 int_status = readl(&ioc->chip->HostInterruptStatus); 2599 int_status = readl(&ioc->chip->HostInterruptStatus);
2600 if (int_status & MPI2_HIS_IOC2SYS_DB_STATUS) { 2600 if (int_status & MPI2_HIS_IOC2SYS_DB_STATUS) {
2601 dhsprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: " 2601 dhsprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: "
2602 "successfull count(%d), timeout(%d)\n", ioc->name, 2602 "successful count(%d), timeout(%d)\n", ioc->name,
2603 __func__, count, timeout)); 2603 __func__, count, timeout));
2604 return 0; 2604 return 0;
2605 } 2605 }
@@ -2640,7 +2640,7 @@ _base_wait_for_doorbell_ack(struct MPT2SAS_ADAPTER *ioc, int timeout,
2640 int_status = readl(&ioc->chip->HostInterruptStatus); 2640 int_status = readl(&ioc->chip->HostInterruptStatus);
2641 if (!(int_status & MPI2_HIS_SYS2IOC_DB_STATUS)) { 2641 if (!(int_status & MPI2_HIS_SYS2IOC_DB_STATUS)) {
2642 dhsprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: " 2642 dhsprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: "
2643 "successfull count(%d), timeout(%d)\n", ioc->name, 2643 "successful count(%d), timeout(%d)\n", ioc->name,
2644 __func__, count, timeout)); 2644 __func__, count, timeout));
2645 return 0; 2645 return 0;
2646 } else if (int_status & MPI2_HIS_IOC2SYS_DB_STATUS) { 2646 } else if (int_status & MPI2_HIS_IOC2SYS_DB_STATUS) {
@@ -2688,7 +2688,7 @@ _base_wait_for_doorbell_not_used(struct MPT2SAS_ADAPTER *ioc, int timeout,
2688 doorbell_reg = readl(&ioc->chip->Doorbell); 2688 doorbell_reg = readl(&ioc->chip->Doorbell);
2689 if (!(doorbell_reg & MPI2_DOORBELL_USED)) { 2689 if (!(doorbell_reg & MPI2_DOORBELL_USED)) {
2690 dhsprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: " 2690 dhsprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: "
2691 "successfull count(%d), timeout(%d)\n", ioc->name, 2691 "successful count(%d), timeout(%d)\n", ioc->name,
2692 __func__, count, timeout)); 2692 __func__, count, timeout));
2693 return 0; 2693 return 0;
2694 } 2694 }
diff --git a/drivers/scsi/mpt2sas/mpt2sas_config.c b/drivers/scsi/mpt2sas/mpt2sas_config.c
index 6afd67b324fe..6861244249a3 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_config.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_config.c
@@ -93,7 +93,7 @@ struct config_request{
93 * @mpi_reply: reply message frame 93 * @mpi_reply: reply message frame
94 * Context: none. 94 * Context: none.
95 * 95 *
96 * Function for displaying debug info helpfull when debugging issues 96 * Function for displaying debug info helpful when debugging issues
97 * in this module. 97 * in this module.
98 */ 98 */
99static void 99static void
diff --git a/drivers/scsi/mpt2sas/mpt2sas_ctl.c b/drivers/scsi/mpt2sas/mpt2sas_ctl.c
index e92b77af5484..1c6d2b405eef 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_ctl.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_ctl.c
@@ -116,7 +116,7 @@ _ctl_sas_device_find_by_handle(struct MPT2SAS_ADAPTER *ioc, u16 handle)
116 * @mpi_reply: reply message frame 116 * @mpi_reply: reply message frame
117 * Context: none. 117 * Context: none.
118 * 118 *
119 * Function for displaying debug info helpfull when debugging issues 119 * Function for displaying debug info helpful when debugging issues
120 * in this module. 120 * in this module.
121 */ 121 */
122static void 122static void
diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
index 6ceb7759bfe5..d2064a0533ae 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
@@ -397,7 +397,7 @@ _scsih_get_sas_address(struct MPT2SAS_ADAPTER *ioc, u16 handle,
397 * @is_raid: [flag] 1 = raid object, 0 = sas object 397 * @is_raid: [flag] 1 = raid object, 0 = sas object
398 * 398 *
399 * Determines whether this device should be first reported device to 399 * Determines whether this device should be first reported device to
400 * to scsi-ml or sas transport, this purpose is for persistant boot device. 400 * to scsi-ml or sas transport, this purpose is for persistent boot device.
401 * There are primary, alternate, and current entries in bios page 2. The order 401 * There are primary, alternate, and current entries in bios page 2. The order
402 * priority is primary, alternate, then current. This routine saves 402 * priority is primary, alternate, then current. This routine saves
403 * the corresponding device object and is_raid flag in the ioc object. 403 * the corresponding device object and is_raid flag in the ioc object.
@@ -2671,10 +2671,10 @@ _scsih_block_io_to_children_attached_directly(struct MPT2SAS_ADAPTER *ioc,
2671 * @handle: device handle 2671 * @handle: device handle
2672 * Context: interrupt time. 2672 * Context: interrupt time.
2673 * 2673 *
2674 * This code is to initiate the device removal handshake protocal 2674 * This code is to initiate the device removal handshake protocol
2675 * with controller firmware. This function will issue target reset 2675 * with controller firmware. This function will issue target reset
2676 * using high priority request queue. It will send a sas iounit 2676 * using high priority request queue. It will send a sas iounit
2677 * controll request (MPI2_SAS_OP_REMOVE_DEVICE) from this completion. 2677 * control request (MPI2_SAS_OP_REMOVE_DEVICE) from this completion.
2678 * 2678 *
2679 * This is designed to send muliple task management request at the same 2679 * This is designed to send muliple task management request at the same
2680 * time to the fifo. If the fifo is full, we will append the request, 2680 * time to the fifo. If the fifo is full, we will append the request,
@@ -2749,9 +2749,9 @@ _scsih_tm_tr_send(struct MPT2SAS_ADAPTER *ioc, u16 handle)
2749 * @reply: reply message frame(lower 32bit addr) 2749 * @reply: reply message frame(lower 32bit addr)
2750 * Context: interrupt time. 2750 * Context: interrupt time.
2751 * 2751 *
2752 * This is the sas iounit controll completion routine. 2752 * This is the sas iounit control completion routine.
2753 * This code is part of the code to initiate the device removal 2753 * This code is part of the code to initiate the device removal
2754 * handshake protocal with controller firmware. 2754 * handshake protocol with controller firmware.
2755 * 2755 *
2756 * Return 1 meaning mf should be freed from _base_interrupt 2756 * Return 1 meaning mf should be freed from _base_interrupt
2757 * 0 means the mf is freed from this function. 2757 * 0 means the mf is freed from this function.
@@ -2878,8 +2878,8 @@ _scsih_tm_volume_tr_complete(struct MPT2SAS_ADAPTER *ioc, u16 smid,
2878 * 2878 *
2879 * This is the target reset completion routine. 2879 * This is the target reset completion routine.
2880 * This code is part of the code to initiate the device removal 2880 * This code is part of the code to initiate the device removal
2881 * handshake protocal with controller firmware. 2881 * handshake protocol with controller firmware.
2882 * It will send a sas iounit controll request (MPI2_SAS_OP_REMOVE_DEVICE) 2882 * It will send a sas iounit control request (MPI2_SAS_OP_REMOVE_DEVICE)
2883 * 2883 *
2884 * Return 1 meaning mf should be freed from _base_interrupt 2884 * Return 1 meaning mf should be freed from _base_interrupt
2885 * 0 means the mf is freed from this function. 2885 * 0 means the mf is freed from this function.
@@ -2984,7 +2984,7 @@ _scsih_check_for_pending_tm(struct MPT2SAS_ADAPTER *ioc, u16 smid)
2984 * 2984 *
2985 * This routine added to better handle cable breaker. 2985 * This routine added to better handle cable breaker.
2986 * 2986 *
2987 * This handles the case where driver recieves multiple expander 2987 * This handles the case where driver receives multiple expander
2988 * add and delete events in a single shot. When there is a delete event 2988 * add and delete events in a single shot. When there is a delete event
2989 * the routine will void any pending add events waiting in the event queue. 2989 * the routine will void any pending add events waiting in the event queue.
2990 * 2990 *
@@ -3511,7 +3511,7 @@ _scsih_normalize_sense(char *sense_buffer, struct sense_info *data)
3511 3511
3512#ifdef CONFIG_SCSI_MPT2SAS_LOGGING 3512#ifdef CONFIG_SCSI_MPT2SAS_LOGGING
3513/** 3513/**
3514 * _scsih_scsi_ioc_info - translated non-successfull SCSI_IO request 3514 * _scsih_scsi_ioc_info - translated non-successful SCSI_IO request
3515 * @ioc: per adapter object 3515 * @ioc: per adapter object
3516 * @scmd: pointer to scsi command object 3516 * @scmd: pointer to scsi command object
3517 * @mpi_reply: reply mf payload returned from firmware 3517 * @mpi_reply: reply mf payload returned from firmware
@@ -5138,7 +5138,7 @@ _scsih_sas_broadcast_primative_event(struct MPT2SAS_ADAPTER *ioc,
5138 unsigned long flags; 5138 unsigned long flags;
5139 int r; 5139 int r;
5140 5140
5141 dewtprintk(ioc, printk(MPT2SAS_INFO_FMT "broadcast primative: " 5141 dewtprintk(ioc, printk(MPT2SAS_INFO_FMT "broadcast primitive: "
5142 "phy number(%d), width(%d)\n", ioc->name, event_data->PhyNum, 5142 "phy number(%d), width(%d)\n", ioc->name, event_data->PhyNum,
5143 event_data->PortWidth)); 5143 event_data->PortWidth));
5144 dtmprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: enter\n", ioc->name, 5144 dtmprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: enter\n", ioc->name,
diff --git a/drivers/scsi/ncr53c8xx.c b/drivers/scsi/ncr53c8xx.c
index 46cc3825638d..835d8d66e696 100644
--- a/drivers/scsi/ncr53c8xx.c
+++ b/drivers/scsi/ncr53c8xx.c
@@ -2679,7 +2679,7 @@ static struct script script0 __initdata = {
2679}/*-------------------------< RESEL_TAG >-------------------*/,{ 2679}/*-------------------------< RESEL_TAG >-------------------*/,{
2680 /* 2680 /*
2681 ** Read IDENTIFY + SIMPLE + TAG using a single MOVE. 2681 ** Read IDENTIFY + SIMPLE + TAG using a single MOVE.
2682 ** Agressive optimization, is'nt it? 2682 ** Aggressive optimization, is'nt it?
2683 ** No need to test the SIMPLE TAG message, since the 2683 ** No need to test the SIMPLE TAG message, since the
2684 ** driver only supports conformant devices for tags. ;-) 2684 ** driver only supports conformant devices for tags. ;-)
2685 */ 2685 */
diff --git a/drivers/scsi/nsp32.c b/drivers/scsi/nsp32.c
index 6b8b021400f8..f6a50c98c36f 100644
--- a/drivers/scsi/nsp32.c
+++ b/drivers/scsi/nsp32.c
@@ -1288,7 +1288,7 @@ static irqreturn_t do_nsp32_isr(int irq, void *dev_id)
1288 nsp32_dbg(NSP32_DEBUG_INTR, "SSACK=0x%lx", 1288 nsp32_dbg(NSP32_DEBUG_INTR, "SSACK=0x%lx",
1289 nsp32_read4(base, SAVED_SACK_CNT)); 1289 nsp32_read4(base, SAVED_SACK_CNT));
1290 1290
1291 scsi_set_resid(SCpnt, 0); /* all data transfered! */ 1291 scsi_set_resid(SCpnt, 0); /* all data transferred! */
1292 } 1292 }
1293 1293
1294 /* 1294 /*
@@ -1630,7 +1630,7 @@ static int nsp32_busfree_occur(struct scsi_cmnd *SCpnt, unsigned short execph)
1630 1630
1631 /* 1631 /*
1632 * If SAVEDSACKCNT == 0, it means SavedDataPointer is 1632 * If SAVEDSACKCNT == 0, it means SavedDataPointer is
1633 * come after data transfering. 1633 * come after data transferring.
1634 */ 1634 */
1635 if (s_sacklen > 0) { 1635 if (s_sacklen > 0) {
1636 /* 1636 /*
@@ -1785,7 +1785,7 @@ static void nsp32_adjust_busfree(struct scsi_cmnd *SCpnt, unsigned int s_sacklen
1785 the head element of the sg. restlen is correctly calculated. */ 1785 the head element of the sg. restlen is correctly calculated. */
1786 } 1786 }
1787 1787
1788 /* calculate the rest length for transfering */ 1788 /* calculate the rest length for transferring */
1789 restlen = sentlen - s_sacklen; 1789 restlen = sentlen - s_sacklen;
1790 1790
1791 /* update adjusting current SG table entry */ 1791 /* update adjusting current SG table entry */
diff --git a/drivers/scsi/nsp32.h b/drivers/scsi/nsp32.h
index 9565acf1aa72..c0221829069c 100644
--- a/drivers/scsi/nsp32.h
+++ b/drivers/scsi/nsp32.h
@@ -507,7 +507,7 @@ typedef struct _nsp32_lunt {
507/* 507/*
508 * SCSI TARGET/LUN definition 508 * SCSI TARGET/LUN definition
509 */ 509 */
510#define NSP32_HOST_SCSIID 7 /* SCSI initiator is everytime defined as 7 */ 510#define NSP32_HOST_SCSIID 7 /* SCSI initiator is every time defined as 7 */
511#define MAX_TARGET 8 511#define MAX_TARGET 8
512#define MAX_LUN 8 /* XXX: In SPI3, max number of LUN is 64. */ 512#define MAX_LUN 8 /* XXX: In SPI3, max number of LUN is 64. */
513 513
diff --git a/drivers/scsi/osst.c b/drivers/scsi/osst.c
index 521e2182d45b..58f5be4740e9 100644
--- a/drivers/scsi/osst.c
+++ b/drivers/scsi/osst.c
@@ -1366,7 +1366,7 @@ error:
1366/* The values below are based on the OnStream frame payload size of 32K == 2**15, 1366/* The values below are based on the OnStream frame payload size of 32K == 2**15,
1367 * that is, OSST_FRAME_SHIFT + OSST_SECTOR_SHIFT must be 15. With a minimum block 1367 * that is, OSST_FRAME_SHIFT + OSST_SECTOR_SHIFT must be 15. With a minimum block
1368 * size of 512 bytes, we need to be able to resolve 32K/512 == 64 == 2**6 positions 1368 * size of 512 bytes, we need to be able to resolve 32K/512 == 64 == 2**6 positions
1369 * inside each frame. Finaly, OSST_SECTOR_MASK == 2**OSST_FRAME_SHIFT - 1. 1369 * inside each frame. Finally, OSST_SECTOR_MASK == 2**OSST_FRAME_SHIFT - 1.
1370 */ 1370 */
1371#define OSST_FRAME_SHIFT 6 1371#define OSST_FRAME_SHIFT 6
1372#define OSST_SECTOR_SHIFT 9 1372#define OSST_SECTOR_SHIFT 9
@@ -3131,7 +3131,7 @@ static int osst_flush_write_buffer(struct osst_tape *STp, struct osst_request **
3131 } 3131 }
3132#if DEBUG 3132#if DEBUG
3133 if (debugging) 3133 if (debugging)
3134 printk(OSST_DEB_MSG "%s:D: Flushing %d bytes, Transfering %d bytes in %d lblocks.\n", 3134 printk(OSST_DEB_MSG "%s:D: Flushing %d bytes, Transferring %d bytes in %d lblocks.\n",
3135 name, offset, transfer, blks); 3135 name, offset, transfer, blks);
3136#endif 3136#endif
3137 3137
@@ -3811,7 +3811,7 @@ static ssize_t osst_read(struct file * filp, char __user * buf, size_t count, lo
3811 3811
3812 if (transfer == 0) { 3812 if (transfer == 0) {
3813 printk(KERN_WARNING 3813 printk(KERN_WARNING
3814 "%s:W: Nothing can be transfered, requested %Zd, tape block size (%d%c).\n", 3814 "%s:W: Nothing can be transferred, requested %Zd, tape block size (%d%c).\n",
3815 name, count, STp->block_size < 1024? 3815 name, count, STp->block_size < 1024?
3816 STp->block_size:STp->block_size/1024, 3816 STp->block_size:STp->block_size/1024,
3817 STp->block_size<1024?'b':'k'); 3817 STp->block_size<1024?'b':'k');
diff --git a/drivers/scsi/osst.h b/drivers/scsi/osst.h
index 11d26c57f3f8..b4fea98ba276 100644
--- a/drivers/scsi/osst.h
+++ b/drivers/scsi/osst.h
@@ -413,7 +413,7 @@ typedef struct os_dat_s {
413 * AUX 413 * AUX
414 */ 414 */
415typedef struct os_aux_s { 415typedef struct os_aux_s {
416 __be32 format_id; /* hardware compability AUX is based on */ 416 __be32 format_id; /* hardware compatibility AUX is based on */
417 char application_sig[4]; /* driver used to write this media */ 417 char application_sig[4]; /* driver used to write this media */
418 __be32 hdwr; /* reserved */ 418 __be32 hdwr; /* reserved */
419 __be32 update_frame_cntr; /* for configuration frame */ 419 __be32 update_frame_cntr; /* for configuration frame */
diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c
index be3f33d31a99..54bdf6d85c6d 100644
--- a/drivers/scsi/pcmcia/nsp_cs.c
+++ b/drivers/scsi/pcmcia/nsp_cs.c
@@ -742,7 +742,7 @@ static void nsp_pio_read(struct scsi_cmnd *SCpnt)
742 742
743 res = nsp_fifo_count(SCpnt) - ocount; 743 res = nsp_fifo_count(SCpnt) - ocount;
744 //nsp_dbg(NSP_DEBUG_DATA_IO, "ptr=0x%p this=0x%x ocount=0x%x res=0x%x", SCpnt->SCp.ptr, SCpnt->SCp.this_residual, ocount, res); 744 //nsp_dbg(NSP_DEBUG_DATA_IO, "ptr=0x%p this=0x%x ocount=0x%x res=0x%x", SCpnt->SCp.ptr, SCpnt->SCp.this_residual, ocount, res);
745 if (res == 0) { /* if some data avilable ? */ 745 if (res == 0) { /* if some data available ? */
746 if (stat == BUSPHASE_DATA_IN) { /* phase changed? */ 746 if (stat == BUSPHASE_DATA_IN) { /* phase changed? */
747 //nsp_dbg(NSP_DEBUG_DATA_IO, " wait for data this=%d", SCpnt->SCp.this_residual); 747 //nsp_dbg(NSP_DEBUG_DATA_IO, " wait for data this=%d", SCpnt->SCp.this_residual);
748 continue; 748 continue;
diff --git a/drivers/scsi/pm8001/pm8001_hwi.c b/drivers/scsi/pm8001/pm8001_hwi.c
index 18b6c55cd08c..8b7db1e53c10 100644
--- a/drivers/scsi/pm8001/pm8001_hwi.c
+++ b/drivers/scsi/pm8001/pm8001_hwi.c
@@ -339,7 +339,7 @@ update_outbnd_queue_table(struct pm8001_hba_info *pm8001_ha, int number)
339 339
340/** 340/**
341 * bar4_shift - function is called to shift BAR base address 341 * bar4_shift - function is called to shift BAR base address
342 * @pm8001_ha : our hba card infomation 342 * @pm8001_ha : our hba card information
343 * @shiftValue : shifting value in memory bar. 343 * @shiftValue : shifting value in memory bar.
344 */ 344 */
345static int bar4_shift(struct pm8001_hba_info *pm8001_ha, u32 shiftValue) 345static int bar4_shift(struct pm8001_hba_info *pm8001_ha, u32 shiftValue)
diff --git a/drivers/scsi/pm8001/pm8001_hwi.h b/drivers/scsi/pm8001/pm8001_hwi.h
index 833a5201eda4..909132041c07 100644
--- a/drivers/scsi/pm8001/pm8001_hwi.h
+++ b/drivers/scsi/pm8001/pm8001_hwi.h
@@ -209,7 +209,7 @@ struct pio_setup_fis {
209 209
210/* 210/*
211 * brief the data structure of SATA Completion Response 211 * brief the data structure of SATA Completion Response
212 * use to discribe the sata task response (64 bytes) 212 * use to describe the sata task response (64 bytes)
213 */ 213 */
214struct sata_completion_resp { 214struct sata_completion_resp {
215 __le32 tag; 215 __le32 tag;
@@ -951,7 +951,7 @@ struct set_dev_state_resp {
951#define PCIE_EVENT_INTERRUPT 0x003044 951#define PCIE_EVENT_INTERRUPT 0x003044
952#define PCIE_ERROR_INTERRUPT_ENABLE 0x003048 952#define PCIE_ERROR_INTERRUPT_ENABLE 0x003048
953#define PCIE_ERROR_INTERRUPT 0x00304C 953#define PCIE_ERROR_INTERRUPT 0x00304C
954/* signature defintion for host scratch pad0 register */ 954/* signature definition for host scratch pad0 register */
955#define SPC_SOFT_RESET_SIGNATURE 0x252acbcd 955#define SPC_SOFT_RESET_SIGNATURE 0x252acbcd
956/* Signature for Soft Reset */ 956/* Signature for Soft Reset */
957 957
diff --git a/drivers/scsi/pm8001/pm8001_sas.h b/drivers/scsi/pm8001/pm8001_sas.h
index bdb6b27dedd6..aa05e661d113 100644
--- a/drivers/scsi/pm8001/pm8001_sas.h
+++ b/drivers/scsi/pm8001/pm8001_sas.h
@@ -445,7 +445,7 @@ struct fw_control_info {
445struct fw_control_ex { 445struct fw_control_ex {
446 struct fw_control_info *fw_control; 446 struct fw_control_info *fw_control;
447 void *buffer;/* keep buffer pointer to be 447 void *buffer;/* keep buffer pointer to be
448 freed when the responce comes*/ 448 freed when the response comes*/
449 void *virtAddr;/* keep virtual address of the data */ 449 void *virtAddr;/* keep virtual address of the data */
450 void *usrAddr;/* keep virtual address of the 450 void *usrAddr;/* keep virtual address of the
451 user data */ 451 user data */
diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
index bcf858e88c64..96d5ad0c1e42 100644
--- a/drivers/scsi/pmcraid.c
+++ b/drivers/scsi/pmcraid.c
@@ -213,7 +213,7 @@ static int pmcraid_slave_alloc(struct scsi_device *scsi_dev)
213 * pmcraid_slave_configure - Configures a SCSI device 213 * pmcraid_slave_configure - Configures a SCSI device
214 * @scsi_dev: scsi device struct 214 * @scsi_dev: scsi device struct
215 * 215 *
216 * This fucntion is executed by SCSI mid layer just after a device is first 216 * This function is executed by SCSI mid layer just after a device is first
217 * scanned (i.e. it has responded to an INQUIRY). For VSET resources, the 217 * scanned (i.e. it has responded to an INQUIRY). For VSET resources, the
218 * timeout value (default 30s) will be over-written to a higher value (60s) 218 * timeout value (default 30s) will be over-written to a higher value (60s)
219 * and max_sectors value will be over-written to 512. It also sets queue depth 219 * and max_sectors value will be over-written to 512. It also sets queue depth
@@ -2122,7 +2122,7 @@ static void pmcraid_fail_outstanding_cmds(struct pmcraid_instance *pinstance)
2122 * 2122 *
2123 * This function executes most of the steps required for IOA reset. This gets 2123 * This function executes most of the steps required for IOA reset. This gets
2124 * called by user threads (modprobe/insmod/rmmod) timer, tasklet and midlayer's 2124 * called by user threads (modprobe/insmod/rmmod) timer, tasklet and midlayer's
2125 * 'eh_' thread. Access to variables used for controling the reset sequence is 2125 * 'eh_' thread. Access to variables used for controlling the reset sequence is
2126 * synchronized using host lock. Various functions called during reset process 2126 * synchronized using host lock. Various functions called during reset process
2127 * would make use of a single command block, pointer to which is also stored in 2127 * would make use of a single command block, pointer to which is also stored in
2128 * adapter instance structure. 2128 * adapter instance structure.
@@ -2994,7 +2994,7 @@ static int pmcraid_abort_complete(struct pmcraid_cmd *cancel_cmd)
2994 2994
2995 /* If the abort task is not timed out we will get a Good completion 2995 /* If the abort task is not timed out we will get a Good completion
2996 * as sense_key, otherwise we may get one the following responses 2996 * as sense_key, otherwise we may get one the following responses
2997 * due to subsquent bus reset or device reset. In case IOASC is 2997 * due to subsequent bus reset or device reset. In case IOASC is
2998 * NR_SYNC_REQUIRED, set sync_reqd flag for the corresponding resource 2998 * NR_SYNC_REQUIRED, set sync_reqd flag for the corresponding resource
2999 */ 2999 */
3000 if (ioasc == PMCRAID_IOASC_UA_BUS_WAS_RESET || 3000 if (ioasc == PMCRAID_IOASC_UA_BUS_WAS_RESET ||
@@ -3933,7 +3933,7 @@ static long pmcraid_ioctl_passthrough(
3933 3933
3934 /* if abort task couldn't find the command i.e it got 3934 /* if abort task couldn't find the command i.e it got
3935 * completed prior to aborting, return good completion. 3935 * completed prior to aborting, return good completion.
3936 * if command got aborted succesfully or there was IOA 3936 * if command got aborted successfully or there was IOA
3937 * reset due to abort task itself getting timedout then 3937 * reset due to abort task itself getting timedout then
3938 * return -ETIMEDOUT 3938 * return -ETIMEDOUT
3939 */ 3939 */
@@ -5932,7 +5932,7 @@ static int __devinit pmcraid_probe(
5932 * However, firmware supports 64-bit streaming DMA buffers, whereas 5932 * However, firmware supports 64-bit streaming DMA buffers, whereas
5933 * coherent buffers are to be 32-bit. Since pci_alloc_consistent always 5933 * coherent buffers are to be 32-bit. Since pci_alloc_consistent always
5934 * returns memory within 4GB (if not, change this logic), coherent 5934 * returns memory within 4GB (if not, change this logic), coherent
5935 * buffers are within firmware acceptible address ranges. 5935 * buffers are within firmware acceptable address ranges.
5936 */ 5936 */
5937 if ((sizeof(dma_addr_t) == 4) || 5937 if ((sizeof(dma_addr_t) == 4) ||
5938 pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) 5938 pci_set_dma_mask(pdev, DMA_BIT_MASK(64)))
diff --git a/drivers/scsi/pmcraid.h b/drivers/scsi/pmcraid.h
index 4db210d93947..34e4c915002e 100644
--- a/drivers/scsi/pmcraid.h
+++ b/drivers/scsi/pmcraid.h
@@ -1024,7 +1024,7 @@ static struct pmcraid_ioasc_error pmcraid_ioasc_error_table[] = {
1024 1024
1025 1025
1026/* 1026/*
1027 * pmcraid_ioctl_header - definition of header structure that preceeds all the 1027 * pmcraid_ioctl_header - definition of header structure that precedes all the
1028 * buffers given as ioctl arguments. 1028 * buffers given as ioctl arguments.
1029 * 1029 *
1030 * .signature : always ASCII string, "PMCRAID" 1030 * .signature : always ASCII string, "PMCRAID"
diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c
index 5dec684bf010..8ba5744c267e 100644
--- a/drivers/scsi/qla1280.c
+++ b/drivers/scsi/qla1280.c
@@ -78,7 +78,7 @@
78 - Clean up vchan handling 78 - Clean up vchan handling
79 Rev 3.23.33 July 3, 2003, Jes Sorensen 79 Rev 3.23.33 July 3, 2003, Jes Sorensen
80 - Don't define register access macros before define determining MMIO. 80 - Don't define register access macros before define determining MMIO.
81 This just happend to work out on ia64 but not elsewhere. 81 This just happened to work out on ia64 but not elsewhere.
82 - Don't try and read from the card while it is in reset as 82 - Don't try and read from the card while it is in reset as
83 it won't respond and causes an MCA 83 it won't respond and causes an MCA
84 Rev 3.23.32 June 23, 2003, Jes Sorensen 84 Rev 3.23.32 June 23, 2003, Jes Sorensen
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index 6c51c0a35b9e..ee20353c8550 100644
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -2086,7 +2086,7 @@ struct ct_sns_pkt {
2086}; 2086};
2087 2087
2088/* 2088/*
2089 * SNS command structures -- for 2200 compatability. 2089 * SNS command structures -- for 2200 compatibility.
2090 */ 2090 */
2091#define RFT_ID_SNS_SCMD_LEN 22 2091#define RFT_ID_SNS_SCMD_LEN 22
2092#define RFT_ID_SNS_CMD_SIZE 60 2092#define RFT_ID_SNS_CMD_SIZE 60
diff --git a/drivers/scsi/qla2xxx/qla_fw.h b/drivers/scsi/qla2xxx/qla_fw.h
index 631fefc8482d..f5ba09c8a663 100644
--- a/drivers/scsi/qla2xxx/qla_fw.h
+++ b/drivers/scsi/qla2xxx/qla_fw.h
@@ -539,7 +539,7 @@ struct sts_entry_24xx {
539 * If DIF Error is set in comp_status, these additional fields are 539 * If DIF Error is set in comp_status, these additional fields are
540 * defined: 540 * defined:
541 * &data[10] : uint8_t report_runt_bg[2]; - computed guard 541 * &data[10] : uint8_t report_runt_bg[2]; - computed guard
542 * &data[12] : uint8_t actual_dif[8]; - DIF Data recieved 542 * &data[12] : uint8_t actual_dif[8]; - DIF Data received
543 * &data[20] : uint8_t expected_dif[8]; - DIF Data computed 543 * &data[20] : uint8_t expected_dif[8]; - DIF Data computed
544 */ 544 */
545}; 545};
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index d17ed9a94a0c..712518d05128 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -414,7 +414,7 @@ skip_rio:
414 "marked OFFLINE!\n"); 414 "marked OFFLINE!\n");
415 vha->flags.online = 0; 415 vha->flags.online = 0;
416 } else { 416 } else {
417 /* Check to see if MPI timeout occured */ 417 /* Check to see if MPI timeout occurred */
418 if ((mbx & MBX_3) && (ha->flags.port0)) 418 if ((mbx & MBX_3) && (ha->flags.port0))
419 set_bit(MPI_RESET_NEEDED, 419 set_bit(MPI_RESET_NEEDED,
420 &vha->dpc_flags); 420 &vha->dpc_flags);
diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
index 7a7c0ecfe7dd..34893397ac84 100644
--- a/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/drivers/scsi/qla2xxx/qla_mbx.c
@@ -303,7 +303,7 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)
303 !test_bit(ISP_ABORT_RETRY, &vha->dpc_flags)) { 303 !test_bit(ISP_ABORT_RETRY, &vha->dpc_flags)) {
304 304
305 qla_printk(KERN_WARNING, ha, 305 qla_printk(KERN_WARNING, ha,
306 "Mailbox command timeout occured. " 306 "Mailbox command timeout occurred. "
307 "Scheduling ISP " "abort. eeh_busy: 0x%x\n", 307 "Scheduling ISP " "abort. eeh_busy: 0x%x\n",
308 ha->flags.eeh_busy); 308 ha->flags.eeh_busy);
309 set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags); 309 set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
@@ -321,7 +321,7 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)
321 !test_bit(ISP_ABORT_RETRY, &vha->dpc_flags)) { 321 !test_bit(ISP_ABORT_RETRY, &vha->dpc_flags)) {
322 322
323 qla_printk(KERN_WARNING, ha, 323 qla_printk(KERN_WARNING, ha,
324 "Mailbox command timeout occured. " 324 "Mailbox command timeout occurred. "
325 "Issuing ISP abort.\n"); 325 "Issuing ISP abort.\n");
326 326
327 set_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags); 327 set_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags);
@@ -3789,7 +3789,7 @@ qla2x00_loopback_test(scsi_qla_host_t *vha, struct msg_echo_lb *mreq,
3789 mcp->mb[20] = LSW(MSD(mreq->send_dma)); 3789 mcp->mb[20] = LSW(MSD(mreq->send_dma));
3790 mcp->mb[21] = MSW(MSD(mreq->send_dma)); 3790 mcp->mb[21] = MSW(MSD(mreq->send_dma));
3791 3791
3792 /* recieve data address */ 3792 /* receive data address */
3793 mcp->mb[16] = LSW(mreq->rcv_dma); 3793 mcp->mb[16] = LSW(mreq->rcv_dma);
3794 mcp->mb[17] = MSW(mreq->rcv_dma); 3794 mcp->mb[17] = MSW(mreq->rcv_dma);
3795 mcp->mb[6] = LSW(MSD(mreq->rcv_dma)); 3795 mcp->mb[6] = LSW(MSD(mreq->rcv_dma));
diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c
index 76ec876e6b21..455fe134d31d 100644
--- a/drivers/scsi/qla2xxx/qla_nx.c
+++ b/drivers/scsi/qla2xxx/qla_nx.c
@@ -2598,7 +2598,7 @@ qla82xx_calc_dsd_lists(uint16_t dsds)
2598 * qla82xx_start_scsi() - Send a SCSI command to the ISP 2598 * qla82xx_start_scsi() - Send a SCSI command to the ISP
2599 * @sp: command to send to the ISP 2599 * @sp: command to send to the ISP
2600 * 2600 *
2601 * Returns non-zero if a failure occured, else zero. 2601 * Returns non-zero if a failure occurred, else zero.
2602 */ 2602 */
2603int 2603int
2604qla82xx_start_scsi(srb_t *sp) 2604qla82xx_start_scsi(srb_t *sp)
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 75a966c94860..aa7747529165 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -1046,7 +1046,7 @@ qla2xxx_eh_bus_reset(struct scsi_cmnd *cmd)
1046 1046
1047eh_bus_reset_done: 1047eh_bus_reset_done:
1048 qla_printk(KERN_INFO, vha->hw, "%s: reset %s\n", __func__, 1048 qla_printk(KERN_INFO, vha->hw, "%s: reset %s\n", __func__,
1049 (ret == FAILED) ? "failed" : "succeded"); 1049 (ret == FAILED) ? "failed" : "succeeded");
1050 1050
1051 return ret; 1051 return ret;
1052} 1052}
@@ -1136,7 +1136,7 @@ qla2xxx_eh_host_reset(struct scsi_cmnd *cmd)
1136 1136
1137eh_host_reset_lock: 1137eh_host_reset_lock:
1138 qla_printk(KERN_INFO, ha, "%s: reset %s\n", __func__, 1138 qla_printk(KERN_INFO, ha, "%s: reset %s\n", __func__,
1139 (ret == FAILED) ? "failed" : "succeded"); 1139 (ret == FAILED) ? "failed" : "succeeded");
1140 1140
1141 return ret; 1141 return ret;
1142} 1142}
@@ -3902,7 +3902,7 @@ uint32_t qla82xx_error_recovery(scsi_qla_host_t *base_vha)
3902 continue; 3902 continue;
3903 if (atomic_read(&other_pdev->enable_cnt)) { 3903 if (atomic_read(&other_pdev->enable_cnt)) {
3904 DEBUG17(qla_printk(KERN_INFO, ha, 3904 DEBUG17(qla_printk(KERN_INFO, ha,
3905 "Found PCI func availabe and enabled at 0x%x\n", 3905 "Found PCI func available and enabled at 0x%x\n",
3906 fn)); 3906 fn));
3907 pci_dev_put(other_pdev); 3907 pci_dev_put(other_pdev);
3908 break; 3908 break;
diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
index c1f8d1b150f7..4757878d59dd 100644
--- a/drivers/scsi/qla4xxx/ql4_def.h
+++ b/drivers/scsi/qla4xxx/ql4_def.h
@@ -182,7 +182,7 @@ struct srb {
182 uint16_t flags; /* (1) Status flags. */ 182 uint16_t flags; /* (1) Status flags. */
183 183
184#define SRB_DMA_VALID BIT_3 /* DMA Buffer mapped. */ 184#define SRB_DMA_VALID BIT_3 /* DMA Buffer mapped. */
185#define SRB_GOT_SENSE BIT_4 /* sense data recieved. */ 185#define SRB_GOT_SENSE BIT_4 /* sense data received. */
186 uint8_t state; /* (1) Status flags. */ 186 uint8_t state; /* (1) Status flags. */
187 187
188#define SRB_NO_QUEUE_STATE 0 /* Request is in between states */ 188#define SRB_NO_QUEUE_STATE 0 /* Request is in between states */
diff --git a/drivers/scsi/qla4xxx/ql4_init.c b/drivers/scsi/qla4xxx/ql4_init.c
index bbb2e903d38a..48e2241ddaf4 100644
--- a/drivers/scsi/qla4xxx/ql4_init.c
+++ b/drivers/scsi/qla4xxx/ql4_init.c
@@ -1338,7 +1338,7 @@ exit_init_hba:
1338 } 1338 }
1339 1339
1340 DEBUG2(printk("scsi%ld: initialize adapter: %s\n", ha->host_no, 1340 DEBUG2(printk("scsi%ld: initialize adapter: %s\n", ha->host_no,
1341 status == QLA_ERROR ? "FAILED" : "SUCCEDED")); 1341 status == QLA_ERROR ? "FAILED" : "SUCCEEDED"));
1342 return status; 1342 return status;
1343} 1343}
1344 1344
diff --git a/drivers/scsi/qla4xxx/ql4_nvram.h b/drivers/scsi/qla4xxx/ql4_nvram.h
index b3831bd29479..945cc328f57f 100644
--- a/drivers/scsi/qla4xxx/ql4_nvram.h
+++ b/drivers/scsi/qla4xxx/ql4_nvram.h
@@ -28,7 +28,7 @@
28#define FM93C56A_ERASE 0x3 28#define FM93C56A_ERASE 0x3
29#define FM93C56A_ERASE_ALL 0x0 29#define FM93C56A_ERASE_ALL 0x0
30 30
31/* Command Extentions */ 31/* Command Extensions */
32#define FM93C56A_WEN_EXT 0x3 32#define FM93C56A_WEN_EXT 0x3
33#define FM93C56A_WRITE_ALL_EXT 0x1 33#define FM93C56A_WRITE_ALL_EXT 0x1
34#define FM93C56A_WDS_EXT 0x0 34#define FM93C56A_WDS_EXT 0x0
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index a4acb0dd7beb..230ba097d28c 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -1213,7 +1213,7 @@ recover_ha_init_adapter:
1213 1213
1214 clear_bit(DPC_RESET_ACTIVE, &ha->dpc_flags); 1214 clear_bit(DPC_RESET_ACTIVE, &ha->dpc_flags);
1215 DEBUG2(printk("scsi%ld: recover adapter: %s\n", ha->host_no, 1215 DEBUG2(printk("scsi%ld: recover adapter: %s\n", ha->host_no,
1216 status == QLA_ERROR ? "FAILED" : "SUCCEDED")); 1216 status == QLA_ERROR ? "FAILED" : "SUCCEEDED"));
1217 1217
1218 return status; 1218 return status;
1219} 1219}
@@ -2110,7 +2110,7 @@ static int qla4xxx_eh_abort(struct scsi_cmnd *cmd)
2110 2110
2111 ql4_printk(KERN_INFO, ha, 2111 ql4_printk(KERN_INFO, ha,
2112 "scsi%ld:%d:%d: Abort command - %s\n", 2112 "scsi%ld:%d:%d: Abort command - %s\n",
2113 ha->host_no, id, lun, (ret == SUCCESS) ? "succeded" : "failed"); 2113 ha->host_no, id, lun, (ret == SUCCESS) ? "succeeded" : "failed");
2114 2114
2115 return ret; 2115 return ret;
2116} 2116}
@@ -2278,7 +2278,7 @@ static int qla4xxx_eh_host_reset(struct scsi_cmnd *cmd)
2278 return_status = SUCCESS; 2278 return_status = SUCCESS;
2279 2279
2280 ql4_printk(KERN_INFO, ha, "HOST RESET %s.\n", 2280 ql4_printk(KERN_INFO, ha, "HOST RESET %s.\n",
2281 return_status == FAILED ? "FAILED" : "SUCCEDED"); 2281 return_status == FAILED ? "FAILED" : "SUCCEEDED");
2282 2282
2283 return return_status; 2283 return return_status;
2284} 2284}
@@ -2492,7 +2492,7 @@ qla4xxx_pci_slot_reset(struct pci_dev *pdev)
2492 /* Initialize device or resume if in suspended state */ 2492 /* Initialize device or resume if in suspended state */
2493 rc = pci_enable_device(pdev); 2493 rc = pci_enable_device(pdev);
2494 if (rc) { 2494 if (rc) {
2495 ql4_printk(KERN_WARNING, ha, "scsi%ld: %s: Cant re-enable " 2495 ql4_printk(KERN_WARNING, ha, "scsi%ld: %s: Can't re-enable "
2496 "device after reset\n", ha->host_no, __func__); 2496 "device after reset\n", ha->host_no, __func__);
2497 goto exit_slot_reset; 2497 goto exit_slot_reset;
2498 } 2498 }
diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
index fa5758cbdedb..6888b2ca5bfc 100644
--- a/drivers/scsi/scsi_debug.c
+++ b/drivers/scsi/scsi_debug.c
@@ -2454,7 +2454,7 @@ static void scsi_debug_slave_destroy(struct scsi_device *sdp)
2454 printk(KERN_INFO "scsi_debug: slave_destroy <%u %u %u %u>\n", 2454 printk(KERN_INFO "scsi_debug: slave_destroy <%u %u %u %u>\n",
2455 sdp->host->host_no, sdp->channel, sdp->id, sdp->lun); 2455 sdp->host->host_no, sdp->channel, sdp->id, sdp->lun);
2456 if (devip) { 2456 if (devip) {
2457 /* make this slot avaliable for re-use */ 2457 /* make this slot available for re-use */
2458 devip->used = 0; 2458 devip->used = 0;
2459 sdp->hostdata = NULL; 2459 sdp->hostdata = NULL;
2460 } 2460 }
diff --git a/drivers/scsi/scsi_netlink.c b/drivers/scsi/scsi_netlink.c
index a2ed201885ae..26a8a45584ef 100644
--- a/drivers/scsi/scsi_netlink.c
+++ b/drivers/scsi/scsi_netlink.c
@@ -499,7 +499,7 @@ scsi_netlink_init(void)
499 SCSI_NL_GRP_CNT, scsi_nl_rcv_msg, NULL, 499 SCSI_NL_GRP_CNT, scsi_nl_rcv_msg, NULL,
500 THIS_MODULE); 500 THIS_MODULE);
501 if (!scsi_nl_sock) { 501 if (!scsi_nl_sock) {
502 printk(KERN_ERR "%s: register of recieve handler failed\n", 502 printk(KERN_ERR "%s: register of receive handler failed\n",
503 __func__); 503 __func__);
504 netlink_unregister_notifier(&scsi_netlink_notifier); 504 netlink_unregister_notifier(&scsi_netlink_notifier);
505 return; 505 return;
diff --git a/drivers/scsi/scsi_tgt_lib.c b/drivers/scsi/scsi_tgt_lib.c
index f67282058ba1..8bca8c25ba69 100644
--- a/drivers/scsi/scsi_tgt_lib.c
+++ b/drivers/scsi/scsi_tgt_lib.c
@@ -93,7 +93,7 @@ struct scsi_cmnd *scsi_host_get_command(struct Scsi_Host *shost,
93 93
94 /* 94 /*
95 * The blk helpers are used to the READ/WRITE requests 95 * The blk helpers are used to the READ/WRITE requests
96 * transfering data from a initiator point of view. Since 96 * transferring data from a initiator point of view. Since
97 * we are in target mode we want the opposite. 97 * we are in target mode we want the opposite.
98 */ 98 */
99 rq = blk_get_request(shost->uspace_req_q, !write, gfp_mask); 99 rq = blk_get_request(shost->uspace_req_q, !write, gfp_mask);
diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
index 2941d2d92c94..fdf3fa639056 100644
--- a/drivers/scsi/scsi_transport_fc.c
+++ b/drivers/scsi/scsi_transport_fc.c
@@ -2378,7 +2378,7 @@ fc_flush_devloss(struct Scsi_Host *shost)
2378 * fc_remove_host - called to terminate any fc_transport-related elements for a scsi host. 2378 * fc_remove_host - called to terminate any fc_transport-related elements for a scsi host.
2379 * @shost: Which &Scsi_Host 2379 * @shost: Which &Scsi_Host
2380 * 2380 *
2381 * This routine is expected to be called immediately preceeding the 2381 * This routine is expected to be called immediately preceding the
2382 * a driver's call to scsi_remove_host(). 2382 * a driver's call to scsi_remove_host().
2383 * 2383 *
2384 * WARNING: A driver utilizing the fc_transport, which fails to call 2384 * WARNING: A driver utilizing the fc_transport, which fails to call
@@ -2458,7 +2458,7 @@ static void fc_terminate_rport_io(struct fc_rport *rport)
2458} 2458}
2459 2459
2460/** 2460/**
2461 * fc_starget_delete - called to delete the scsi decendents of an rport 2461 * fc_starget_delete - called to delete the scsi descendants of an rport
2462 * @work: remote port to be operated on. 2462 * @work: remote port to be operated on.
2463 * 2463 *
2464 * Deletes target and all sdevs. 2464 * Deletes target and all sdevs.
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index b61ebec6bca7..bd0806e64e85 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -1055,7 +1055,7 @@ static int sd_getgeo(struct block_device *bdev, struct hd_geometry *geo)
1055 * @arg: this is third argument given to ioctl(2) system call. 1055 * @arg: this is third argument given to ioctl(2) system call.
1056 * Often contains a pointer. 1056 * Often contains a pointer.
1057 * 1057 *
1058 * Returns 0 if successful (some ioctls return postive numbers on 1058 * Returns 0 if successful (some ioctls return positive numbers on
1059 * success as well). Returns a negated errno value in case of error. 1059 * success as well). Returns a negated errno value in case of error.
1060 * 1060 *
1061 * Note: most ioctls are forward onto the block subsystem or further 1061 * Note: most ioctls are forward onto the block subsystem or further
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index aefadc6a1607..95019c747cc1 100644
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -567,7 +567,7 @@ static const struct block_device_operations sr_bdops =
567 .revalidate_disk = sr_block_revalidate_disk, 567 .revalidate_disk = sr_block_revalidate_disk,
568 /* 568 /*
569 * No compat_ioctl for now because sr_block_ioctl never 569 * No compat_ioctl for now because sr_block_ioctl never
570 * seems to pass arbitary ioctls down to host drivers. 570 * seems to pass arbitrary ioctls down to host drivers.
571 */ 571 */
572}; 572};
573 573
diff --git a/drivers/scsi/sun3_NCR5380.c b/drivers/scsi/sun3_NCR5380.c
index 4f0e5485ffde..07eaef1c722b 100644
--- a/drivers/scsi/sun3_NCR5380.c
+++ b/drivers/scsi/sun3_NCR5380.c
@@ -467,7 +467,7 @@ static void free_all_tags( void )
467 * 467 *
468 * Parameters: struct scsi_cmnd *cmd 468 * Parameters: struct scsi_cmnd *cmd
469 * The command to work on. The first scatter buffer's data are 469 * The command to work on. The first scatter buffer's data are
470 * assumed to be already transfered into ptr/this_residual. 470 * assumed to be already transferred into ptr/this_residual.
471 */ 471 */
472 472
473static void merge_contiguous_buffers(struct scsi_cmnd *cmd) 473static void merge_contiguous_buffers(struct scsi_cmnd *cmd)
@@ -1717,7 +1717,7 @@ static int NCR5380_select(struct Scsi_Host *instance, struct scsi_cmnd *cmd,
1717 * bytes to transfer, **data - pointer to data pointer. 1717 * bytes to transfer, **data - pointer to data pointer.
1718 * 1718 *
1719 * Returns : -1 when different phase is entered without transferring 1719 * Returns : -1 when different phase is entered without transferring
1720 * maximum number of bytes, 0 if all bytes are transfered or exit 1720 * maximum number of bytes, 0 if all bytes are transferred or exit
1721 * is in same phase. 1721 * is in same phase.
1722 * 1722 *
1723 * Also, *phase, *count, *data are modified in place. 1723 * Also, *phase, *count, *data are modified in place.
@@ -1904,7 +1904,7 @@ static int do_abort (struct Scsi_Host *host)
1904 * bytes to transfer, **data - pointer to data pointer. 1904 * bytes to transfer, **data - pointer to data pointer.
1905 * 1905 *
1906 * Returns : -1 when different phase is entered without transferring 1906 * Returns : -1 when different phase is entered without transferring
1907 * maximum number of bytes, 0 if all bytes or transfered or exit 1907 * maximum number of bytes, 0 if all bytes or transferred or exit
1908 * is in same phase. 1908 * is in same phase.
1909 * 1909 *
1910 * Also, *phase, *count, *data are modified in place. 1910 * Also, *phase, *count, *data are modified in place.
diff --git a/drivers/scsi/sym53c416.c b/drivers/scsi/sym53c416.c
index 190107ae120b..012c86edd59f 100644
--- a/drivers/scsi/sym53c416.c
+++ b/drivers/scsi/sym53c416.c
@@ -774,7 +774,7 @@ static int sym53c416_host_reset(Scsi_Cmnd *SCpnt)
774 774
775 /* printk("sym53c416_reset\n"); */ 775 /* printk("sym53c416_reset\n"); */
776 base = SCpnt->device->host->io_port; 776 base = SCpnt->device->host->io_port;
777 /* search scsi_id - fixme, we shouldnt need to iterate for this! */ 777 /* search scsi_id - fixme, we shouldn't need to iterate for this! */
778 for(i = 0; i < host_index && scsi_id == -1; i++) 778 for(i = 0; i < host_index && scsi_id == -1; i++)
779 if(hosts[i].base == base) 779 if(hosts[i].base == base)
780 scsi_id = hosts[i].scsi_id; 780 scsi_id = hosts[i].scsi_id;
diff --git a/drivers/scsi/sym53c8xx_2/sym_fw1.h b/drivers/scsi/sym53c8xx_2/sym_fw1.h
index 7b08d6caaa99..63952ee300b5 100644
--- a/drivers/scsi/sym53c8xx_2/sym_fw1.h
+++ b/drivers/scsi/sym53c8xx_2/sym_fw1.h
@@ -1449,7 +1449,7 @@ static struct SYM_FWB_SCR SYM_FWB_SCR = {
1449 PADDR_B (msg_weird_seen), 1449 PADDR_B (msg_weird_seen),
1450 /* 1450 /*
1451 * We donnot handle extended messages from SCRIPTS. 1451 * We donnot handle extended messages from SCRIPTS.
1452 * Read the amount of data correponding to the 1452 * Read the amount of data corresponding to the
1453 * message length and call the C code. 1453 * message length and call the C code.
1454 */ 1454 */
1455 SCR_COPY (1), 1455 SCR_COPY (1),
diff --git a/drivers/scsi/sym53c8xx_2/sym_fw2.h b/drivers/scsi/sym53c8xx_2/sym_fw2.h
index ae1fb179b88e..c87d72443a16 100644
--- a/drivers/scsi/sym53c8xx_2/sym_fw2.h
+++ b/drivers/scsi/sym53c8xx_2/sym_fw2.h
@@ -1326,7 +1326,7 @@ static struct SYM_FWB_SCR SYM_FWB_SCR = {
1326 PADDR_B (msg_weird_seen), 1326 PADDR_B (msg_weird_seen),
1327 /* 1327 /*
1328 * We donnot handle extended messages from SCRIPTS. 1328 * We donnot handle extended messages from SCRIPTS.
1329 * Read the amount of data correponding to the 1329 * Read the amount of data corresponding to the
1330 * message length and call the C code. 1330 * message length and call the C code.
1331 */ 1331 */
1332 SCR_STORE_REL (scratcha, 1), 1332 SCR_STORE_REL (scratcha, 1),
diff --git a/drivers/scsi/sym53c8xx_2/sym_hipd.c b/drivers/scsi/sym53c8xx_2/sym_hipd.c
index 2c3e89ddf069..d92fe4037e94 100644
--- a/drivers/scsi/sym53c8xx_2/sym_hipd.c
+++ b/drivers/scsi/sym53c8xx_2/sym_hipd.c
@@ -2457,7 +2457,7 @@ static void sym_int_ma (struct sym_hcb *np)
2457 } 2457 }
2458 2458
2459 /* 2459 /*
2460 * The data in the dma fifo has not been transfered to 2460 * The data in the dma fifo has not been transferred to
2461 * the target -> add the amount to the rest 2461 * the target -> add the amount to the rest
2462 * and clear the data. 2462 * and clear the data.
2463 * Check the sstat2 register in case of wide transfer. 2463 * Check the sstat2 register in case of wide transfer.
@@ -5094,7 +5094,7 @@ fail:
5094} 5094}
5095 5095
5096/* 5096/*
5097 * Lun control block deallocation. Returns the number of valid remaing LCBs 5097 * Lun control block deallocation. Returns the number of valid remaining LCBs
5098 * for the target. 5098 * for the target.
5099 */ 5099 */
5100int sym_free_lcb(struct sym_hcb *np, u_char tn, u_char ln) 5100int sym_free_lcb(struct sym_hcb *np, u_char tn, u_char ln)
diff --git a/drivers/scsi/sym53c8xx_2/sym_malloc.c b/drivers/scsi/sym53c8xx_2/sym_malloc.c
index 883cac10daf9..6f9af0de7ec3 100644
--- a/drivers/scsi/sym53c8xx_2/sym_malloc.c
+++ b/drivers/scsi/sym53c8xx_2/sym_malloc.c
@@ -50,7 +50,7 @@
50 * from the SCRIPTS code. In addition, cache line alignment 50 * from the SCRIPTS code. In addition, cache line alignment
51 * is guaranteed for power of 2 cache line size. 51 * is guaranteed for power of 2 cache line size.
52 * 52 *
53 * This allocator has been developped for the Linux sym53c8xx 53 * This allocator has been developed for the Linux sym53c8xx
54 * driver, since this O/S does not provide naturally aligned 54 * driver, since this O/S does not provide naturally aligned
55 * allocations. 55 * allocations.
56 * It has the advantage of allowing the driver to use private 56 * It has the advantage of allowing the driver to use private
diff --git a/drivers/scsi/wd33c93.c b/drivers/scsi/wd33c93.c
index 5f697e0bd009..4468ae3610f7 100644
--- a/drivers/scsi/wd33c93.c
+++ b/drivers/scsi/wd33c93.c
@@ -1843,7 +1843,7 @@ check_setup_args(char *key, int *flags, int *val, char *buf)
1843 * 1843 *
1844 * The original driver used to rely on a fixed sx_table, containing periods 1844 * The original driver used to rely on a fixed sx_table, containing periods
1845 * for (only) the lower limits of the respective input-clock-frequency ranges 1845 * for (only) the lower limits of the respective input-clock-frequency ranges
1846 * (8-10/12-15/16-20 MHz). Although it seems, that no problems ocurred with 1846 * (8-10/12-15/16-20 MHz). Although it seems, that no problems occurred with
1847 * this setting so far, it might be desirable to adjust the transfer periods 1847 * this setting so far, it might be desirable to adjust the transfer periods
1848 * closer to the really attached, possibly 25% higher, input-clock, since 1848 * closer to the really attached, possibly 25% higher, input-clock, since
1849 * - the wd33c93 may really use a significant shorter period, than it has 1849 * - the wd33c93 may really use a significant shorter period, than it has
diff --git a/drivers/scsi/wd7000.c b/drivers/scsi/wd7000.c
index db451ae0a368..9ee0afef2d16 100644
--- a/drivers/scsi/wd7000.c
+++ b/drivers/scsi/wd7000.c
@@ -837,7 +837,7 @@ static inline Scb *alloc_scbs(struct Scsi_Host *host, int needed)
837 } 837 }
838 } 838 }
839 839
840 /* Take the lock, then check we didnt get beaten, if so try again */ 840 /* Take the lock, then check we didn't get beaten, if so try again */
841 spin_lock_irqsave(&scbpool_lock, flags); 841 spin_lock_irqsave(&scbpool_lock, flags);
842 if (freescbs < needed) { 842 if (freescbs < needed) {
843 spin_unlock_irqrestore(&scbpool_lock, flags); 843 spin_unlock_irqrestore(&scbpool_lock, flags);