diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-13 15:00:02 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-13 15:00:02 -0500 |
commit | a2013a13e68354e0c8f3696b69701803e13fb737 (patch) | |
tree | a7e1da6bfad1aa2afd83f401874d606269ce90b4 /drivers/scsi | |
parent | dadfab4873256d2145640c0ce468fcbfb48977fe (diff) | |
parent | 106f9d9337f65bd428c0c79f650e3489e458d771 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial branch from Jiri Kosina:
"Usual stuff -- comment/printk typo fixes, documentation updates, dead
code elimination."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
HOWTO: fix double words typo
x86 mtrr: fix comment typo in mtrr_bp_init
propagate name change to comments in kernel source
doc: Update the name of profiling based on sysfs
treewide: Fix typos in various drivers
treewide: Fix typos in various Kconfig
wireless: mwifiex: Fix typo in wireless/mwifiex driver
messages: i2o: Fix typo in messages/i2o
scripts/kernel-doc: check that non-void fcts describe their return value
Kernel-doc: Convention: Use a "Return" section to describe return values
radeon: Fix typo and copy/paste error in comments
doc: Remove unnecessary declarations from Documentation/accounting/getdelays.c
various: Fix spelling of "asynchronous" in comments.
Fix misspellings of "whether" in comments.
eisa: Fix spelling of "asynchronous".
various: Fix spelling of "registered" in comments.
doc: fix quite a few typos within Documentation
target: iscsi: fix comment typos in target/iscsi drivers
treewide: fix typo of "suport" in various comments and Kconfig
treewide: fix typo of "suppport" in various comments
...
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/bnx2fc/bnx2fc_hwi.c | 2 | ||||
-rw-r--r-- | drivers/scsi/libsas/sas_expander.c | 2 | ||||
-rw-r--r-- | drivers/scsi/qla2xxx/qla_isr.c | 4 | ||||
-rw-r--r-- | drivers/scsi/qla2xxx/qla_nx.c | 4 | ||||
-rw-r--r-- | drivers/scsi/qla2xxx/qla_target.c | 12 | ||||
-rw-r--r-- | drivers/scsi/qla2xxx/tcm_qla2xxx.c | 2 |
6 files changed, 13 insertions, 13 deletions
diff --git a/drivers/scsi/bnx2fc/bnx2fc_hwi.c b/drivers/scsi/bnx2fc/bnx2fc_hwi.c index 6d6eee42ac7d..ef60afa94d0e 100644 --- a/drivers/scsi/bnx2fc/bnx2fc_hwi.c +++ b/drivers/scsi/bnx2fc/bnx2fc_hwi.c | |||
@@ -296,7 +296,7 @@ int bnx2fc_send_session_ofld_req(struct fcoe_port *port, | |||
296 | ofld_req3.flags |= (interface->vlan_enabled << | 296 | ofld_req3.flags |= (interface->vlan_enabled << |
297 | FCOE_KWQE_CONN_OFFLOAD3_B_VLAN_FLAG_SHIFT); | 297 | FCOE_KWQE_CONN_OFFLOAD3_B_VLAN_FLAG_SHIFT); |
298 | 298 | ||
299 | /* C2_VALID and ACK flags are not set as they are not suppported */ | 299 | /* C2_VALID and ACK flags are not set as they are not supported */ |
300 | 300 | ||
301 | 301 | ||
302 | /* Initialize offload request 4 structure */ | 302 | /* Initialize offload request 4 structure */ |
diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c index efc6e72f09f3..aec2e0da5016 100644 --- a/drivers/scsi/libsas/sas_expander.c +++ b/drivers/scsi/libsas/sas_expander.c | |||
@@ -1800,7 +1800,7 @@ out: | |||
1800 | * @dev:domain device to be detect. | 1800 | * @dev:domain device to be detect. |
1801 | * @src_dev: the device which originated BROADCAST(CHANGE). | 1801 | * @src_dev: the device which originated BROADCAST(CHANGE). |
1802 | * | 1802 | * |
1803 | * Add self-configuration expander suport. Suppose two expander cascading, | 1803 | * Add self-configuration expander support. Suppose two expander cascading, |
1804 | * when the first level expander is self-configuring, hotplug the disks in | 1804 | * when the first level expander is self-configuring, hotplug the disks in |
1805 | * second level expander, BROADCAST(CHANGE) will not only be originated | 1805 | * second level expander, BROADCAST(CHANGE) will not only be originated |
1806 | * in the second level expander, but also be originated in the first level | 1806 | * in the second level expander, but also be originated in the first level |
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c index 5733811ce8e7..9d1c7b56090a 100644 --- a/drivers/scsi/qla2xxx/qla_isr.c +++ b/drivers/scsi/qla2xxx/qla_isr.c | |||
@@ -251,7 +251,7 @@ qla2x00_mbx_completion(scsi_qla_host_t *vha, uint16_t mb0) | |||
251 | /* Read all mbox registers? */ | 251 | /* Read all mbox registers? */ |
252 | mboxes = (1 << ha->mbx_count) - 1; | 252 | mboxes = (1 << ha->mbx_count) - 1; |
253 | if (!ha->mcp) | 253 | if (!ha->mcp) |
254 | ql_dbg(ql_dbg_async, vha, 0x5001, "MBX pointer ERRROR.\n"); | 254 | ql_dbg(ql_dbg_async, vha, 0x5001, "MBX pointer ERROR.\n"); |
255 | else | 255 | else |
256 | mboxes = ha->mcp->in_mb; | 256 | mboxes = ha->mcp->in_mb; |
257 | 257 | ||
@@ -2318,7 +2318,7 @@ qla24xx_mbx_completion(scsi_qla_host_t *vha, uint16_t mb0) | |||
2318 | /* Read all mbox registers? */ | 2318 | /* Read all mbox registers? */ |
2319 | mboxes = (1 << ha->mbx_count) - 1; | 2319 | mboxes = (1 << ha->mbx_count) - 1; |
2320 | if (!ha->mcp) | 2320 | if (!ha->mcp) |
2321 | ql_dbg(ql_dbg_async, vha, 0x504e, "MBX pointer ERRROR.\n"); | 2321 | ql_dbg(ql_dbg_async, vha, 0x504e, "MBX pointer ERROR.\n"); |
2322 | else | 2322 | else |
2323 | mboxes = ha->mcp->in_mb; | 2323 | mboxes = ha->mcp->in_mb; |
2324 | 2324 | ||
diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c index 14cd361742fa..f5e297c6b684 100644 --- a/drivers/scsi/qla2xxx/qla_nx.c +++ b/drivers/scsi/qla2xxx/qla_nx.c | |||
@@ -955,7 +955,7 @@ qla82xx_rom_fast_read(struct qla_hw_data *ha, int addr, int *valp) | |||
955 | } | 955 | } |
956 | if (loops >= 50000) { | 956 | if (loops >= 50000) { |
957 | ql_log(ql_log_fatal, vha, 0x00b9, | 957 | ql_log(ql_log_fatal, vha, 0x00b9, |
958 | "Failed to aquire SEM2 lock.\n"); | 958 | "Failed to acquire SEM2 lock.\n"); |
959 | return -1; | 959 | return -1; |
960 | } | 960 | } |
961 | ret = qla82xx_do_rom_fast_read(ha, addr, valp); | 961 | ret = qla82xx_do_rom_fast_read(ha, addr, valp); |
@@ -1122,7 +1122,7 @@ qla82xx_pinit_from_rom(scsi_qla_host_t *vha) | |||
1122 | long data; | 1122 | long data; |
1123 | }; | 1123 | }; |
1124 | 1124 | ||
1125 | /* Halt all the indiviual PEGs and other blocks of the ISP */ | 1125 | /* Halt all the individual PEGs and other blocks of the ISP */ |
1126 | qla82xx_rom_lock(ha); | 1126 | qla82xx_rom_lock(ha); |
1127 | 1127 | ||
1128 | /* disable all I2Q */ | 1128 | /* disable all I2Q */ |
diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c index 62aa5584f644..b49d21779a24 100644 --- a/drivers/scsi/qla2xxx/qla_target.c +++ b/drivers/scsi/qla2xxx/qla_target.c | |||
@@ -73,7 +73,7 @@ enum fcp_resp_rsp_codes { | |||
73 | #define FCP_PTA_SIMPLE 0 /* simple task attribute */ | 73 | #define FCP_PTA_SIMPLE 0 /* simple task attribute */ |
74 | #define FCP_PTA_HEADQ 1 /* head of queue task attribute */ | 74 | #define FCP_PTA_HEADQ 1 /* head of queue task attribute */ |
75 | #define FCP_PTA_ORDERED 2 /* ordered task attribute */ | 75 | #define FCP_PTA_ORDERED 2 /* ordered task attribute */ |
76 | #define FCP_PTA_ACA 4 /* auto. contigent allegiance */ | 76 | #define FCP_PTA_ACA 4 /* auto. contingent allegiance */ |
77 | #define FCP_PTA_MASK 7 /* mask for task attribute field */ | 77 | #define FCP_PTA_MASK 7 /* mask for task attribute field */ |
78 | #define FCP_PRI_SHIFT 3 /* priority field starts in bit 3 */ | 78 | #define FCP_PRI_SHIFT 3 /* priority field starts in bit 3 */ |
79 | #define FCP_PRI_RESVD_MASK 0x80 /* reserved bits in priority field */ | 79 | #define FCP_PRI_RESVD_MASK 0x80 /* reserved bits in priority field */ |
@@ -3980,7 +3980,7 @@ void qlt_async_event(uint16_t code, struct scsi_qla_host *vha, | |||
3980 | case MBA_RSP_TRANSFER_ERR: /* Response Transfer Error */ | 3980 | case MBA_RSP_TRANSFER_ERR: /* Response Transfer Error */ |
3981 | ql_dbg(ql_dbg_tgt_mgt, vha, 0xf03a, | 3981 | ql_dbg(ql_dbg_tgt_mgt, vha, 0xf03a, |
3982 | "qla_target(%d): System error async event %#x " | 3982 | "qla_target(%d): System error async event %#x " |
3983 | "occured", vha->vp_idx, code); | 3983 | "occurred", vha->vp_idx, code); |
3984 | break; | 3984 | break; |
3985 | case MBA_WAKEUP_THRES: /* Request Queue Wake-up. */ | 3985 | case MBA_WAKEUP_THRES: /* Request Queue Wake-up. */ |
3986 | set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags); | 3986 | set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags); |
@@ -3989,7 +3989,7 @@ void qlt_async_event(uint16_t code, struct scsi_qla_host *vha, | |||
3989 | case MBA_LOOP_UP: | 3989 | case MBA_LOOP_UP: |
3990 | { | 3990 | { |
3991 | ql_dbg(ql_dbg_tgt_mgt, vha, 0xf03b, | 3991 | ql_dbg(ql_dbg_tgt_mgt, vha, 0xf03b, |
3992 | "qla_target(%d): Async LOOP_UP occured " | 3992 | "qla_target(%d): Async LOOP_UP occurred " |
3993 | "(m[0]=%x, m[1]=%x, m[2]=%x, m[3]=%x)", vha->vp_idx, | 3993 | "(m[0]=%x, m[1]=%x, m[2]=%x, m[3]=%x)", vha->vp_idx, |
3994 | le16_to_cpu(mailbox[0]), le16_to_cpu(mailbox[1]), | 3994 | le16_to_cpu(mailbox[0]), le16_to_cpu(mailbox[1]), |
3995 | le16_to_cpu(mailbox[2]), le16_to_cpu(mailbox[3])); | 3995 | le16_to_cpu(mailbox[2]), le16_to_cpu(mailbox[3])); |
@@ -4006,7 +4006,7 @@ void qlt_async_event(uint16_t code, struct scsi_qla_host *vha, | |||
4006 | case MBA_LIP_RESET: | 4006 | case MBA_LIP_RESET: |
4007 | case MBA_RSCN_UPDATE: | 4007 | case MBA_RSCN_UPDATE: |
4008 | ql_dbg(ql_dbg_tgt_mgt, vha, 0xf03c, | 4008 | ql_dbg(ql_dbg_tgt_mgt, vha, 0xf03c, |
4009 | "qla_target(%d): Async event %#x occured " | 4009 | "qla_target(%d): Async event %#x occurred " |
4010 | "(m[0]=%x, m[1]=%x, m[2]=%x, m[3]=%x)", vha->vp_idx, code, | 4010 | "(m[0]=%x, m[1]=%x, m[2]=%x, m[3]=%x)", vha->vp_idx, code, |
4011 | le16_to_cpu(mailbox[0]), le16_to_cpu(mailbox[1]), | 4011 | le16_to_cpu(mailbox[0]), le16_to_cpu(mailbox[1]), |
4012 | le16_to_cpu(mailbox[2]), le16_to_cpu(mailbox[3])); | 4012 | le16_to_cpu(mailbox[2]), le16_to_cpu(mailbox[3])); |
@@ -4015,7 +4015,7 @@ void qlt_async_event(uint16_t code, struct scsi_qla_host *vha, | |||
4015 | case MBA_PORT_UPDATE: | 4015 | case MBA_PORT_UPDATE: |
4016 | ql_dbg(ql_dbg_tgt_mgt, vha, 0xf03d, | 4016 | ql_dbg(ql_dbg_tgt_mgt, vha, 0xf03d, |
4017 | "qla_target(%d): Port update async event %#x " | 4017 | "qla_target(%d): Port update async event %#x " |
4018 | "occured: updating the ports database (m[0]=%x, m[1]=%x, " | 4018 | "occurred: updating the ports database (m[0]=%x, m[1]=%x, " |
4019 | "m[2]=%x, m[3]=%x)", vha->vp_idx, code, | 4019 | "m[2]=%x, m[3]=%x)", vha->vp_idx, code, |
4020 | le16_to_cpu(mailbox[0]), le16_to_cpu(mailbox[1]), | 4020 | le16_to_cpu(mailbox[0]), le16_to_cpu(mailbox[1]), |
4021 | le16_to_cpu(mailbox[2]), le16_to_cpu(mailbox[3])); | 4021 | le16_to_cpu(mailbox[2]), le16_to_cpu(mailbox[3])); |
@@ -4031,7 +4031,7 @@ void qlt_async_event(uint16_t code, struct scsi_qla_host *vha, | |||
4031 | 4031 | ||
4032 | default: | 4032 | default: |
4033 | ql_dbg(ql_dbg_tgt_mgt, vha, 0xf040, | 4033 | ql_dbg(ql_dbg_tgt_mgt, vha, 0xf040, |
4034 | "qla_target(%d): Async event %#x occured: " | 4034 | "qla_target(%d): Async event %#x occurred: " |
4035 | "ignore (m[0]=%x, m[1]=%x, m[2]=%x, m[3]=%x)", vha->vp_idx, | 4035 | "ignore (m[0]=%x, m[1]=%x, m[2]=%x, m[3]=%x)", vha->vp_idx, |
4036 | code, le16_to_cpu(mailbox[0]), le16_to_cpu(mailbox[1]), | 4036 | code, le16_to_cpu(mailbox[0]), le16_to_cpu(mailbox[1]), |
4037 | le16_to_cpu(mailbox[2]), le16_to_cpu(mailbox[3])); | 4037 | le16_to_cpu(mailbox[2]), le16_to_cpu(mailbox[3])); |
diff --git a/drivers/scsi/qla2xxx/tcm_qla2xxx.c b/drivers/scsi/qla2xxx/tcm_qla2xxx.c index 3d74f2f39ae1..4372e32bc95f 100644 --- a/drivers/scsi/qla2xxx/tcm_qla2xxx.c +++ b/drivers/scsi/qla2xxx/tcm_qla2xxx.c | |||
@@ -367,7 +367,7 @@ static struct se_node_acl *tcm_qla2xxx_alloc_fabric_acl( | |||
367 | 367 | ||
368 | nacl = kzalloc(sizeof(struct tcm_qla2xxx_nacl), GFP_KERNEL); | 368 | nacl = kzalloc(sizeof(struct tcm_qla2xxx_nacl), GFP_KERNEL); |
369 | if (!nacl) { | 369 | if (!nacl) { |
370 | pr_err("Unable to alocate struct tcm_qla2xxx_nacl\n"); | 370 | pr_err("Unable to allocate struct tcm_qla2xxx_nacl\n"); |
371 | return NULL; | 371 | return NULL; |
372 | } | 372 | } |
373 | 373 | ||