1 files changed, 12 insertions, 23 deletions

diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
index 2a3e9e66d4ef..fa0f7761652a 100644
--- a/drivers/message/fusion/mptscsih.c
+++ b/drivers/message/fusion/mptscsih.c
@@ -819,10 +819,7 @@ mptscsih_io_done(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *mr)
                         sc->resid=0;
                 case MPI_IOCSTATUS_SCSI_RECOVERED_ERROR:        /* 0x0040 */
                 case MPI_IOCSTATUS_SUCCESS:                     /* 0x0000 */
-                        if (scsi_status == MPI_SCSI_STATUS_BUSY)
-                                sc->result = (DID_BUS_BUSY << 16) | scsi_status;
-                        else
-                                sc->result = (DID_OK << 16) | scsi_status;
+                        sc->result = (DID_OK << 16) | scsi_status;
                         if (scsi_state == 0) {
                                 ;
                         } else if (scsi_state & MPI_SCSI_STATE_AUTOSENSE_VALID) {
@@ -1188,20 +1185,7 @@ mptscsih_suspend(struct pci_dev *pdev, pm_message_t state)
 int
 mptscsih_resume(struct pci_dev *pdev)
 {
-        MPT_ADAPTER             *ioc = pci_get_drvdata(pdev);
-        struct Scsi_Host        *host = ioc->sh;
-        MPT_SCSI_HOST           *hd;
-
-        mpt_resume(pdev);
-
-        if(!host)
-                return 0;
-
-        hd = (MPT_SCSI_HOST *)host->hostdata;
-        if(!hd)
-                return 0;
-
-        return 0;
+        return mpt_resume(pdev);
 }
 
 #endif
@@ -1537,21 +1521,23 @@ mptscsih_freeChainBuffers(MPT_ADAPTER *ioc, int req_idx)
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 /**
  *      mptscsih_TMHandler - Generic handler for SCSI Task Management.
- *      Fall through to mpt_HardResetHandler if: not operational, too many
- *      failed TM requests or handshake failure.
- *
- *      @ioc: Pointer to MPT_ADAPTER structure
+ *      @hd: Pointer to MPT SCSI HOST structure
  *      @type: Task Management type
+ *      @channel: channel number for task management
  *      @id: Logical Target ID for reset (if appropriate)
  *      @lun: Logical Unit for reset (if appropriate)
  *      @ctx2abort: Context for the task to be aborted (if appropriate)
+ *      @timeout: timeout for task management control
+ *
+ *      Fall through to mpt_HardResetHandler if: not operational, too many
+ *      failed TM requests or handshake failure.
  *
  *      Remark: Currently invoked from a non-interrupt thread (_bh).
  *
  *      Remark: With old EH code, at most 1 SCSI TaskMgmt function per IOC
  *      will be active.
  *
- *      Returns 0 for SUCCESS, or FAILED.
+ *      Returns 0 for SUCCESS, or %FAILED.
  **/
 int
 mptscsih_TMHandler(MPT_SCSI_HOST *hd, u8 type, u8 channel, u8 id, int lun, int ctx2abort, ulong timeout)
@@ -1650,9 +1636,11 @@ mptscsih_TMHandler(MPT_SCSI_HOST *hd, u8 type, u8 channel, u8 id, int lun, int c
  *      mptscsih_IssueTaskMgmt - Generic send Task Management function.
  *      @hd: Pointer to MPT_SCSI_HOST structure
  *      @type: Task Management type
+ *      @channel: channel number for task management
  *      @id: Logical Target ID for reset (if appropriate)
  *      @lun: Logical Unit for reset (if appropriate)
  *      @ctx2abort: Context for the task to be aborted (if appropriate)
+ *      @timeout: timeout for task management control
  *
  *      Remark: _HardResetHandler can be invoked from an interrupt thread (timer)
  *      or a non-interrupt thread.  In the former, must not call schedule().
@@ -2022,6 +2010,7 @@ mptscsih_tm_pending_wait(MPT_SCSI_HOST * hd)
 /**
  *      mptscsih_tm_wait_for_completion - wait for completion of TM task
  *      @hd: Pointer to MPT host structure.
+ *      @timeout: timeout value
  *
  *      Returns {SUCCESS,FAILED}.
  */