diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-09 22:43:33 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-09 22:43:33 -0500 |
commit | 4ef58d4e2ad1fa2a3e5bbf41af2284671fca8cf8 (patch) | |
tree | 856ba96302a36014736747e8464f80eeb827bbdd /drivers/scsi/lpfc/lpfc_sli.c | |
parent | f6c4c8195b5e7878823caa1181be404d9e86d369 (diff) | |
parent | d014d043869cdc591f3a33243d3481fa4479c2d0 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (42 commits)
tree-wide: fix misspelling of "definition" in comments
reiserfs: fix misspelling of "journaled"
doc: Fix a typo in slub.txt.
inotify: remove superfluous return code check
hdlc: spelling fix in find_pvc() comment
doc: fix regulator docs cut-and-pasteism
mtd: Fix comment in Kconfig
doc: Fix IRQ chip docs
tree-wide: fix assorted typos all over the place
drivers/ata/libata-sff.c: comment spelling fixes
fix typos/grammos in Documentation/edac.txt
sysctl: add missing comments
fs/debugfs/inode.c: fix comment typos
sgivwfb: Make use of ARRAY_SIZE.
sky2: fix sky2_link_down copy/paste comment error
tree-wide: fix typos "couter" -> "counter"
tree-wide: fix typos "offest" -> "offset"
fix kerneldoc for set_irq_msi()
spidev: fix double "of of" in comment
comment typo fix: sybsystem -> subsystem
...
Diffstat (limited to 'drivers/scsi/lpfc/lpfc_sli.c')
-rw-r--r-- | drivers/scsi/lpfc/lpfc_sli.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c index b3a69f984d95..7935667b81a5 100644 --- a/drivers/scsi/lpfc/lpfc_sli.c +++ b/drivers/scsi/lpfc/lpfc_sli.c | |||
@@ -1804,7 +1804,7 @@ lpfc_sli_handle_mb_event(struct lpfc_hba *phba) | |||
1804 | */ | 1804 | */ |
1805 | if (lpfc_sli_chk_mbx_command(pmbox->mbxCommand) == | 1805 | if (lpfc_sli_chk_mbx_command(pmbox->mbxCommand) == |
1806 | MBX_SHUTDOWN) { | 1806 | MBX_SHUTDOWN) { |
1807 | /* Unknow mailbox command compl */ | 1807 | /* Unknown mailbox command compl */ |
1808 | lpfc_printf_log(phba, KERN_ERR, LOG_MBOX | LOG_SLI, | 1808 | lpfc_printf_log(phba, KERN_ERR, LOG_MBOX | LOG_SLI, |
1809 | "(%d):0323 Unknown Mailbox command " | 1809 | "(%d):0323 Unknown Mailbox command " |
1810 | "x%x (x%x) Cmpl\n", | 1810 | "x%x (x%x) Cmpl\n", |
@@ -4062,7 +4062,7 @@ lpfc_sli4_read_fcoe_params(struct lpfc_hba *phba, | |||
4062 | * addition, this routine gets the port vpd data. | 4062 | * addition, this routine gets the port vpd data. |
4063 | * | 4063 | * |
4064 | * Return codes | 4064 | * Return codes |
4065 | * 0 - sucessful | 4065 | * 0 - successful |
4066 | * ENOMEM - could not allocated memory. | 4066 | * ENOMEM - could not allocated memory. |
4067 | **/ | 4067 | **/ |
4068 | static int | 4068 | static int |
@@ -11428,7 +11428,7 @@ lpfc_sli4_handle_received_buffer(struct lpfc_hba *phba, | |||
11428 | * sequential. | 11428 | * sequential. |
11429 | * | 11429 | * |
11430 | * Return codes | 11430 | * Return codes |
11431 | * 0 - sucessful | 11431 | * 0 - successful |
11432 | * EIO - The mailbox failed to complete successfully. | 11432 | * EIO - The mailbox failed to complete successfully. |
11433 | * When this error occurs, the driver is not guaranteed | 11433 | * When this error occurs, the driver is not guaranteed |
11434 | * to have any rpi regions posted to the device and | 11434 | * to have any rpi regions posted to the device and |
@@ -11466,7 +11466,7 @@ lpfc_sli4_post_all_rpi_hdrs(struct lpfc_hba *phba) | |||
11466 | * maps up to 64 rpi context regions. | 11466 | * maps up to 64 rpi context regions. |
11467 | * | 11467 | * |
11468 | * Return codes | 11468 | * Return codes |
11469 | * 0 - sucessful | 11469 | * 0 - successful |
11470 | * ENOMEM - No available memory | 11470 | * ENOMEM - No available memory |
11471 | * EIO - The mailbox failed to complete successfully. | 11471 | * EIO - The mailbox failed to complete successfully. |
11472 | **/ | 11472 | **/ |
@@ -11528,7 +11528,7 @@ lpfc_sli4_post_rpi_hdr(struct lpfc_hba *phba, struct lpfc_rpi_hdr *rpi_page) | |||
11528 | * PAGE_SIZE modulo 64 rpi context headers. | 11528 | * PAGE_SIZE modulo 64 rpi context headers. |
11529 | * | 11529 | * |
11530 | * Returns | 11530 | * Returns |
11531 | * A nonzero rpi defined as rpi_base <= rpi < max_rpi if sucessful | 11531 | * A nonzero rpi defined as rpi_base <= rpi < max_rpi if successful |
11532 | * LPFC_RPI_ALLOC_ERROR if no rpis are available. | 11532 | * LPFC_RPI_ALLOC_ERROR if no rpis are available. |
11533 | **/ | 11533 | **/ |
11534 | int | 11534 | int |