aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/isci
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-10-01 12:06:36 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-01 12:06:36 -0400
commit99dbb1632f1165c2726056ebfce6edde0e5a0208 (patch)
tree2b2fc83db20b4c6d13842496899774b0dc2868e2 /drivers/scsi/isci
parentaae6f989c6e97ff8197717fa4d032ad4eba091a7 (diff)
parent9c33c512b2d3167a3580659942ee78437b1b1bc6 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull the trivial tree from Jiri Kosina: "Tiny usual fixes all over the place" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (34 commits) doc: fix old config name of kprobetrace fs/fs-writeback.c: cleanup riteback_sb_inodes kerneldoc btrfs: fix the commment for the action flags in delayed-ref.h btrfs: fix trivial typo for the comment of BTRFS_FREE_INO_OBJECTID vfs: fix kerneldoc for generic_fh_to_parent() treewide: fix comment/printk/variable typos ipr: fix small coding style issues doc: fix broken utf8 encoding nfs: comment fix platform/x86: fix asus_laptop.wled_type module parameter mfd: printk/comment fixes doc: getdelays.c: remember to close() socket on error in create_nl_socket() doc: aliasing-test: close fd on write error mmc: fix comment typos dma: fix comments spi: fix comment/printk typos in spi Coccinelle: fix typo in memdup_user.cocci tmiofb: missing NULL pointer checks tools: perf: Fix typo in tools/perf tools/testing: fix comment / output typos ...
Diffstat (limited to 'drivers/scsi/isci')
-rw-r--r--drivers/scsi/isci/host.c2
-rw-r--r--drivers/scsi/isci/init.c2
-rw-r--r--drivers/scsi/isci/port.c2
-rw-r--r--drivers/scsi/isci/request.c2
-rw-r--r--drivers/scsi/isci/task.c2
5 files changed, 5 insertions, 5 deletions
diff --git a/drivers/scsi/isci/host.c b/drivers/scsi/isci/host.c
index 45385f531649..b334fdc1726a 100644
--- a/drivers/scsi/isci/host.c
+++ b/drivers/scsi/isci/host.c
@@ -492,7 +492,7 @@ static void sci_controller_process_completions(struct isci_host *ihost)
492 u32 event_cycle; 492 u32 event_cycle;
493 493
494 dev_dbg(&ihost->pdev->dev, 494 dev_dbg(&ihost->pdev->dev,
495 "%s: completion queue begining get:0x%08x\n", 495 "%s: completion queue beginning get:0x%08x\n",
496 __func__, 496 __func__,
497 ihost->completion_queue_get); 497 ihost->completion_queue_get);
498 498
diff --git a/drivers/scsi/isci/init.c b/drivers/scsi/isci/init.c
index 92c1d86d1fc6..9be45a2b2232 100644
--- a/drivers/scsi/isci/init.c
+++ b/drivers/scsi/isci/init.c
@@ -222,7 +222,7 @@ static struct sas_domain_function_template isci_transport_ops = {
222 * @isci_host: This parameter specifies the lldd specific wrapper for the 222 * @isci_host: This parameter specifies the lldd specific wrapper for the
223 * libsas sas_ha struct. 223 * libsas sas_ha struct.
224 * 224 *
225 * This method returns an error code indicating sucess or failure. The user 225 * This method returns an error code indicating success or failure. The user
226 * should check for possible memory allocation error return otherwise, a zero 226 * should check for possible memory allocation error return otherwise, a zero
227 * indicates success. 227 * indicates success.
228 */ 228 */
diff --git a/drivers/scsi/isci/port.c b/drivers/scsi/isci/port.c
index 2fb85bf75449..13098b09a824 100644
--- a/drivers/scsi/isci/port.c
+++ b/drivers/scsi/isci/port.c
@@ -212,7 +212,7 @@ static void isci_port_link_up(struct isci_host *isci_host,
212 memcpy(iphy->sas_phy.attached_sas_addr, 212 memcpy(iphy->sas_phy.attached_sas_addr,
213 iphy->frame_rcvd.iaf.sas_addr, SAS_ADDR_SIZE); 213 iphy->frame_rcvd.iaf.sas_addr, SAS_ADDR_SIZE);
214 } else { 214 } else {
215 dev_err(&isci_host->pdev->dev, "%s: unkown target\n", __func__); 215 dev_err(&isci_host->pdev->dev, "%s: unknown target\n", __func__);
216 success = false; 216 success = false;
217 } 217 }
218 218
diff --git a/drivers/scsi/isci/request.c b/drivers/scsi/isci/request.c
index 7a0431c73493..c1bafc3f3fb1 100644
--- a/drivers/scsi/isci/request.c
+++ b/drivers/scsi/isci/request.c
@@ -2240,7 +2240,7 @@ static enum sci_status atapi_data_tc_completion_handler(struct isci_request *ire
2240 status = ireq->sci_status; 2240 status = ireq->sci_status;
2241 sci_change_state(&idev->sm, SCI_STP_DEV_ATAPI_ERROR); 2241 sci_change_state(&idev->sm, SCI_STP_DEV_ATAPI_ERROR);
2242 } else { 2242 } else {
2243 /* If receiving any non-sucess TC status, no UF 2243 /* If receiving any non-success TC status, no UF
2244 * received yet, then an UF for the status fis 2244 * received yet, then an UF for the status fis
2245 * is coming after (XXX: suspect this is 2245 * is coming after (XXX: suspect this is
2246 * actually a protocol error or a bug like the 2246 * actually a protocol error or a bug like the
diff --git a/drivers/scsi/isci/task.c b/drivers/scsi/isci/task.c
index 6bc74eb012c9..b6f19a1db780 100644
--- a/drivers/scsi/isci/task.c
+++ b/drivers/scsi/isci/task.c
@@ -532,7 +532,7 @@ int isci_task_abort_task(struct sas_task *task)
532 /* The request has already completed and there 532 /* The request has already completed and there
533 * is nothing to do here other than to set the task 533 * is nothing to do here other than to set the task
534 * done bit, and indicate that the task abort function 534 * done bit, and indicate that the task abort function
535 * was sucessful. 535 * was successful.
536 */ 536 */
537 spin_lock_irqsave(&task->task_state_lock, flags); 537 spin_lock_irqsave(&task->task_state_lock, flags);
538 task->task_state_flags |= SAS_TASK_STATE_DONE; 538 task->task_state_flags |= SAS_TASK_STATE_DONE;