aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-06-26 16:33:14 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-26 16:33:14 -0400
commitda206c9e68cb93fcab43592d46276c02889c1250 (patch)
tree21264cc26fa0322d668b398808f10bd93558d25f /drivers/s390
parent916d15445f4ad2a9018e5451760734f36083be77 (diff)
parent2e2d0dcc1bd7ca7c26ea5e29efb7f34bbd564f1c (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: typo fixes Clean up 'inline is not at beginning' warnings for usb storage Storage class should be first i386: Trivial typo fixes ixj: make ixj_set_tone_off() static spelling fixes fix paniced->panicked typos Spelling fixes for Documentation/atomic_ops.txt move acknowledgment for Mark Adler to CREDITS remove the bouncing email address of David Campbell
Diffstat (limited to 'drivers/s390')
-rw-r--r--drivers/s390/scsi/zfcp_erp.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/s390/scsi/zfcp_erp.c b/drivers/s390/scsi/zfcp_erp.c
index 4682c8b8bd24..909731b99d26 100644
--- a/drivers/s390/scsi/zfcp_erp.c
+++ b/drivers/s390/scsi/zfcp_erp.c
@@ -167,7 +167,7 @@ zfcp_fsf_scsi_er_timeout_handler(unsigned long data)
167 * initiates adapter recovery which is done 167 * initiates adapter recovery which is done
168 * asynchronously 168 * asynchronously
169 * 169 *
170 * returns: 0 - initiated action succesfully 170 * returns: 0 - initiated action successfully
171 * <0 - failed to initiate action 171 * <0 - failed to initiate action
172 */ 172 */
173int 173int
@@ -203,7 +203,7 @@ zfcp_erp_adapter_reopen_internal(struct zfcp_adapter *adapter, int clear_mask)
203 * purpose: Wrappper for zfcp_erp_adapter_reopen_internal 203 * purpose: Wrappper for zfcp_erp_adapter_reopen_internal
204 * used to ensure the correct locking 204 * used to ensure the correct locking
205 * 205 *
206 * returns: 0 - initiated action succesfully 206 * returns: 0 - initiated action successfully
207 * <0 - failed to initiate action 207 * <0 - failed to initiate action
208 */ 208 */
209int 209int
@@ -469,7 +469,7 @@ zfcp_test_link(struct zfcp_port *port)
469 * initiates Forced Reopen recovery which is done 469 * initiates Forced Reopen recovery which is done
470 * asynchronously 470 * asynchronously
471 * 471 *
472 * returns: 0 - initiated action succesfully 472 * returns: 0 - initiated action successfully
473 * <0 - failed to initiate action 473 * <0 - failed to initiate action
474 */ 474 */
475static int 475static int
@@ -509,7 +509,7 @@ zfcp_erp_port_forced_reopen_internal(struct zfcp_port *port, int clear_mask)
509 * purpose: Wrappper for zfcp_erp_port_forced_reopen_internal 509 * purpose: Wrappper for zfcp_erp_port_forced_reopen_internal
510 * used to ensure the correct locking 510 * used to ensure the correct locking
511 * 511 *
512 * returns: 0 - initiated action succesfully 512 * returns: 0 - initiated action successfully
513 * <0 - failed to initiate action 513 * <0 - failed to initiate action
514 */ 514 */
515int 515int
@@ -536,7 +536,7 @@ zfcp_erp_port_forced_reopen(struct zfcp_port *port, int clear_mask)
536 * initiates Reopen recovery which is done 536 * initiates Reopen recovery which is done
537 * asynchronously 537 * asynchronously
538 * 538 *
539 * returns: 0 - initiated action succesfully 539 * returns: 0 - initiated action successfully
540 * <0 - failed to initiate action 540 * <0 - failed to initiate action
541 */ 541 */
542static int 542static int
@@ -605,7 +605,7 @@ zfcp_erp_port_reopen(struct zfcp_port *port, int clear_mask)
605 * initiates Reopen recovery which is done 605 * initiates Reopen recovery which is done
606 * asynchronously 606 * asynchronously
607 * 607 *
608 * returns: 0 - initiated action succesfully 608 * returns: 0 - initiated action successfully
609 * <0 - failed to initiate action 609 * <0 - failed to initiate action
610 */ 610 */
611static int 611static int
@@ -1805,7 +1805,7 @@ zfcp_erp_modify_unit_status(struct zfcp_unit *unit, u32 mask, int set_or_clear)
1805 * purpose: Wrappper for zfcp_erp_port_reopen_all_internal 1805 * purpose: Wrappper for zfcp_erp_port_reopen_all_internal
1806 * used to ensure the correct locking 1806 * used to ensure the correct locking
1807 * 1807 *
1808 * returns: 0 - initiated action succesfully 1808 * returns: 0 - initiated action successfully
1809 * <0 - failed to initiate action 1809 * <0 - failed to initiate action
1810 */ 1810 */
1811int 1811int