Merge branch 'for-3.18/core' of git://git.kernel.dk/linux-block

[karo-tx-linux.git] / drivers / scsi / scsi_error.c

diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index a2c3d3d255a1ad845e867bb8415a76547427b212..9a6f8468225f372bae07f36d4779f8c19f27c6e3 100644 (file)
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -1238,9 +1238,9 @@ retry_tur:
 /**
  * scsi_eh_test_devices - check if devices are responding from error recovery.
  * @cmd_list:  scsi commands in error recovery.
- * @work_q:     queue for commands which still need more error recovery
- * @done_q:     queue for commands which are finished
- * @try_stu:    boolean on if a STU command should be tried in addition to TUR.
+ * @work_q:    queue for commands which still need more error recovery
+ * @done_q:    queue for commands which are finished
+ * @try_stu:   boolean on if a STU command should be tried in addition to TUR.
  *
  * Decription:
  *    Tests if devices are in a working state.  Commands to devices now in
@@ -1373,7 +1373,7 @@ static int scsi_eh_try_stu(struct scsi_cmnd *scmd)
  /**
  * scsi_eh_stu - send START_UNIT if needed
  * @shost:     &scsi host being recovered.
- * @work_q:     &list_head for pending commands.
+ * @work_q:    &list_head for pending commands.
  * @done_q:    &list_head for processed commands.
  *
  * Notes:
@@ -1436,7 +1436,7 @@ static int scsi_eh_stu(struct Scsi_Host *shost,
 /**
  * scsi_eh_bus_device_reset - send bdr if needed
  * @shost:     scsi host being recovered.
- * @work_q:     &list_head for pending commands.
+ * @work_q:    &list_head for pending commands.
  * @done_q:    &list_head for processed commands.
  *
  * Notes:
@@ -1502,7 +1502,7 @@ static int scsi_eh_bus_device_reset(struct Scsi_Host *shost,
 /**
  * scsi_eh_target_reset - send target reset if needed
  * @shost:     scsi host being recovered.
- * @work_q:     &list_head for pending commands.
+ * @work_q:    &list_head for pending commands.
  * @done_q:    &list_head for processed commands.
  *
  * Notes:
@@ -1567,7 +1567,7 @@ static int scsi_eh_target_reset(struct Scsi_Host *shost,
 /**
  * scsi_eh_bus_reset - send a bus reset
  * @shost:     &scsi host being recovered.
- * @work_q:     &list_head for pending commands.
+ * @work_q:    &list_head for pending commands.
  * @done_q:    &list_head for processed commands.
  */
 static int scsi_eh_bus_reset(struct Scsi_Host *shost,
@@ -1638,8 +1638,9 @@ static int scsi_eh_bus_reset(struct Scsi_Host *shost,
 
 /**
  * scsi_eh_host_reset - send a host reset
- * @work_q:    list_head for processed commands.
- * @done_q:    list_head for processed commands.
+ * @shost:     host to be reset.
+ * @work_q:    &list_head for pending commands.
+ * @done_q:    &list_head for processed commands.
  */
 static int scsi_eh_host_reset(struct Scsi_Host *shost,
                              struct list_head *work_q,
@@ -1677,8 +1678,8 @@ static int scsi_eh_host_reset(struct Scsi_Host *shost,
 
 /**
  * scsi_eh_offline_sdevs - offline scsi devices that fail to recover
- * @work_q:    list_head for processed commands.
- * @done_q:    list_head for processed commands.
+ * @work_q:    &list_head for pending commands.
+ * @done_q:    &list_head for processed commands.
  */
 static void scsi_eh_offline_sdevs(struct list_head *work_q,
                                  struct list_head *done_q)
@@ -2045,8 +2046,8 @@ static void scsi_restart_operations(struct Scsi_Host *shost)
 
 /**
  * scsi_eh_ready_devs - check device ready state and recover if not.
- * @shost:     host to be recovered.
- * @work_q:     &list_head for pending commands.
+ * @shost:     host to be recovered.
+ * @work_q:    &list_head for pending commands.
  * @done_q:    &list_head for processed commands.
  */
 void scsi_eh_ready_devs(struct Scsi_Host *shost,