diff options
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/aic94xx/aic94xx_reg_def.h | 2 | ||||
-rw-r--r-- | drivers/scsi/aic94xx/aic94xx_sds.c | 4 | ||||
-rw-r--r-- | drivers/scsi/ncr53c8xx.c | 14 | ||||
-rw-r--r-- | drivers/scsi/ncr53c8xx.h | 6 |
4 files changed, 13 insertions, 13 deletions
diff --git a/drivers/scsi/aic94xx/aic94xx_reg_def.h b/drivers/scsi/aic94xx/aic94xx_reg_def.h index b79f45f3ad47..a11f4e6d8bd9 100644 --- a/drivers/scsi/aic94xx/aic94xx_reg_def.h +++ b/drivers/scsi/aic94xx/aic94xx_reg_def.h | |||
@@ -2000,7 +2000,7 @@ | |||
2000 | * The host accesses this scratch in a different manner from the | 2000 | * The host accesses this scratch in a different manner from the |
2001 | * central sequencer. The sequencer has to use CSEQ registers CSCRPAGE | 2001 | * central sequencer. The sequencer has to use CSEQ registers CSCRPAGE |
2002 | * and CMnSCRPAGE to access the scratch memory. A flat mapping of the | 2002 | * and CMnSCRPAGE to access the scratch memory. A flat mapping of the |
2003 | * scratch memory is avaliable for software convenience and to prevent | 2003 | * scratch memory is available for software convenience and to prevent |
2004 | * corruption while the sequencer is running. This memory is mapped | 2004 | * corruption while the sequencer is running. This memory is mapped |
2005 | * onto addresses 800h - BFFh, total of 400h bytes. | 2005 | * onto addresses 800h - BFFh, total of 400h bytes. |
2006 | * | 2006 | * |
diff --git a/drivers/scsi/aic94xx/aic94xx_sds.c b/drivers/scsi/aic94xx/aic94xx_sds.c index de7c04d4254d..e5a0ec37e954 100644 --- a/drivers/scsi/aic94xx/aic94xx_sds.c +++ b/drivers/scsi/aic94xx/aic94xx_sds.c | |||
@@ -64,7 +64,7 @@ struct asd_ocm_dir { | |||
64 | 64 | ||
65 | #define OCM_INIT_DIR_ENTRIES 5 | 65 | #define OCM_INIT_DIR_ENTRIES 5 |
66 | /*************************************************************************** | 66 | /*************************************************************************** |
67 | * OCM dircetory default | 67 | * OCM directory default |
68 | ***************************************************************************/ | 68 | ***************************************************************************/ |
69 | static struct asd_ocm_dir OCMDirInit = | 69 | static struct asd_ocm_dir OCMDirInit = |
70 | { | 70 | { |
@@ -73,7 +73,7 @@ static struct asd_ocm_dir OCMDirInit = | |||
73 | }; | 73 | }; |
74 | 74 | ||
75 | /*************************************************************************** | 75 | /*************************************************************************** |
76 | * OCM dircetory Entries default | 76 | * OCM directory Entries default |
77 | ***************************************************************************/ | 77 | ***************************************************************************/ |
78 | static struct asd_ocm_dir_ent OCMDirEntriesInit[OCM_INIT_DIR_ENTRIES] = | 78 | static struct asd_ocm_dir_ent OCMDirEntriesInit[OCM_INIT_DIR_ENTRIES] = |
79 | { | 79 | { |
diff --git a/drivers/scsi/ncr53c8xx.c b/drivers/scsi/ncr53c8xx.c index 6cc2bc2f62be..adb8eb4f5fd1 100644 --- a/drivers/scsi/ncr53c8xx.c +++ b/drivers/scsi/ncr53c8xx.c | |||
@@ -185,7 +185,7 @@ static inline struct list_head *ncr_list_pop(struct list_head *head) | |||
185 | ** power of 2 cache line size. | 185 | ** power of 2 cache line size. |
186 | ** Enhanced in linux-2.3.44 to provide a memory pool | 186 | ** Enhanced in linux-2.3.44 to provide a memory pool |
187 | ** per pcidev to support dynamic dma mapping. (I would | 187 | ** per pcidev to support dynamic dma mapping. (I would |
188 | ** have preferred a real bus astraction, btw). | 188 | ** have preferred a real bus abstraction, btw). |
189 | ** | 189 | ** |
190 | **========================================================== | 190 | **========================================================== |
191 | */ | 191 | */ |
@@ -1438,7 +1438,7 @@ struct head { | |||
1438 | ** The first four bytes (scr_st[4]) are used inside the script by | 1438 | ** The first four bytes (scr_st[4]) are used inside the script by |
1439 | ** "COPY" commands. | 1439 | ** "COPY" commands. |
1440 | ** Because source and destination must have the same alignment | 1440 | ** Because source and destination must have the same alignment |
1441 | ** in a DWORD, the fields HAVE to be at the choosen offsets. | 1441 | ** in a DWORD, the fields HAVE to be at the chosen offsets. |
1442 | ** xerr_st 0 (0x34) scratcha | 1442 | ** xerr_st 0 (0x34) scratcha |
1443 | ** sync_st 1 (0x05) sxfer | 1443 | ** sync_st 1 (0x05) sxfer |
1444 | ** wide_st 3 (0x03) scntl3 | 1444 | ** wide_st 3 (0x03) scntl3 |
@@ -1498,7 +1498,7 @@ struct head { | |||
1498 | ** the DSA (data structure address) register points | 1498 | ** the DSA (data structure address) register points |
1499 | ** to this substructure of the ccb. | 1499 | ** to this substructure of the ccb. |
1500 | ** This substructure contains the header with | 1500 | ** This substructure contains the header with |
1501 | ** the script-processor-changable data and | 1501 | ** the script-processor-changeable data and |
1502 | ** data blocks for the indirect move commands. | 1502 | ** data blocks for the indirect move commands. |
1503 | ** | 1503 | ** |
1504 | **---------------------------------------------------------- | 1504 | **---------------------------------------------------------- |
@@ -5107,7 +5107,7 @@ void ncr_complete (struct ncb *np, struct ccb *cp) | |||
5107 | 5107 | ||
5108 | /* | 5108 | /* |
5109 | ** This CCB has been skipped by the NCR. | 5109 | ** This CCB has been skipped by the NCR. |
5110 | ** Queue it in the correponding unit queue. | 5110 | ** Queue it in the corresponding unit queue. |
5111 | */ | 5111 | */ |
5112 | static void ncr_ccb_skipped(struct ncb *np, struct ccb *cp) | 5112 | static void ncr_ccb_skipped(struct ncb *np, struct ccb *cp) |
5113 | { | 5113 | { |
@@ -5896,8 +5896,8 @@ static void ncr_log_hard_error(struct ncb *np, u16 sist, u_char dstat) | |||
5896 | ** | 5896 | ** |
5897 | ** In normal cases, interrupt conditions occur one at a | 5897 | ** In normal cases, interrupt conditions occur one at a |
5898 | ** time. The ncr is able to stack in some extra registers | 5898 | ** time. The ncr is able to stack in some extra registers |
5899 | ** other interrupts that will occurs after the first one. | 5899 | ** other interrupts that will occur after the first one. |
5900 | ** But severall interrupts may occur at the same time. | 5900 | ** But, several interrupts may occur at the same time. |
5901 | ** | 5901 | ** |
5902 | ** We probably should only try to deal with the normal | 5902 | ** We probably should only try to deal with the normal |
5903 | ** case, but it seems that multiple interrupts occur in | 5903 | ** case, but it seems that multiple interrupts occur in |
@@ -6796,7 +6796,7 @@ void ncr_int_sir (struct ncb *np) | |||
6796 | ** The host status field is set to HS_NEGOTIATE to mark this | 6796 | ** The host status field is set to HS_NEGOTIATE to mark this |
6797 | ** situation. | 6797 | ** situation. |
6798 | ** | 6798 | ** |
6799 | ** If the target doesn't answer this message immidiately | 6799 | ** If the target doesn't answer this message immediately |
6800 | ** (as required by the standard), the SIR_NEGO_FAIL interrupt | 6800 | ** (as required by the standard), the SIR_NEGO_FAIL interrupt |
6801 | ** will be raised eventually. | 6801 | ** will be raised eventually. |
6802 | ** The handler removes the HS_NEGOTIATE status, and sets the | 6802 | ** The handler removes the HS_NEGOTIATE status, and sets the |
diff --git a/drivers/scsi/ncr53c8xx.h b/drivers/scsi/ncr53c8xx.h index cb8b7701431e..b39357d9af8d 100644 --- a/drivers/scsi/ncr53c8xx.h +++ b/drivers/scsi/ncr53c8xx.h | |||
@@ -218,7 +218,7 @@ | |||
218 | ** Same as option 1, but also deal with | 218 | ** Same as option 1, but also deal with |
219 | ** misconfigured interrupts. | 219 | ** misconfigured interrupts. |
220 | ** | 220 | ** |
221 | ** - Edge triggerred instead of level sensitive. | 221 | ** - Edge triggered instead of level sensitive. |
222 | ** - No interrupt line connected. | 222 | ** - No interrupt line connected. |
223 | ** - IRQ number misconfigured. | 223 | ** - IRQ number misconfigured. |
224 | ** | 224 | ** |
@@ -549,7 +549,7 @@ struct ncr_driver_setup { | |||
549 | 549 | ||
550 | /* | 550 | /* |
551 | ** Initial setup. | 551 | ** Initial setup. |
552 | ** Can be overriden at startup by a command line. | 552 | ** Can be overridden at startup by a command line. |
553 | */ | 553 | */ |
554 | #define SCSI_NCR_DRIVER_SETUP \ | 554 | #define SCSI_NCR_DRIVER_SETUP \ |
555 | { \ | 555 | { \ |
@@ -1093,7 +1093,7 @@ struct scr_tblsel { | |||
1093 | **----------------------------------------------------------- | 1093 | **----------------------------------------------------------- |
1094 | ** On 810A, 860, 825A, 875, 895 and 896 chips the content | 1094 | ** On 810A, 860, 825A, 875, 895 and 896 chips the content |
1095 | ** of SFBR register can be used as data (SCR_SFBR_DATA). | 1095 | ** of SFBR register can be used as data (SCR_SFBR_DATA). |
1096 | ** The 896 has additionnal IO registers starting at | 1096 | ** The 896 has additional IO registers starting at |
1097 | ** offset 0x80. Bit 7 of register offset is stored in | 1097 | ** offset 0x80. Bit 7 of register offset is stored in |
1098 | ** bit 7 of the SCRIPTS instruction first DWORD. | 1098 | ** bit 7 of the SCRIPTS instruction first DWORD. |
1099 | **----------------------------------------------------------- | 1099 | **----------------------------------------------------------- |