diff options
Diffstat (limited to 'drivers/scsi/dc395x.c')
-rw-r--r-- | drivers/scsi/dc395x.c | 14 |
1 files changed, 7 insertions, 7 deletions
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) | |||
1954 | static void sg_update_list(struct ScsiReqBlk *srb, u32 left) | 1954 | static 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; |