1 files changed, 19 insertions, 30 deletions

diff --git a/drivers/scsi/mpt3sas/mpt3sas_ctl.c b/drivers/scsi/mpt3sas/mpt3sas_ctl.c
index 7d00f09666b6..26cdc127ac89 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_ctl.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_ctl.c
@@ -518,7 +518,7 @@ mpt3sas_ctl_reset_handler(struct MPT3SAS_ADAPTER *ioc, int reset_phase)
  *
  * Called when application request fasyn callback handler.
  */
-int
+static int
 _ctl_fasync(int fd, struct file *filep, int mode)
 {
         return fasync_helper(fd, filep, mode, &async_queue);
@@ -530,7 +530,7 @@ _ctl_fasync(int fd, struct file *filep, int mode)
  * @wait -
  *
  */
-unsigned int
+static unsigned int
 _ctl_poll(struct file *filep, poll_table *wait)
 {
         struct MPT3SAS_ADAPTER *ioc;
@@ -641,9 +641,8 @@ _ctl_do_mpt_command(struct MPT3SAS_ADAPTER *ioc, struct mpt3_ioctl_command karg,
         MPI2RequestHeader_t *mpi_request = NULL, *request;
         MPI2DefaultReply_t *mpi_reply;
         u32 ioc_state;
-        u16 ioc_status;
         u16 smid;
-        unsigned long timeout, timeleft;
+        unsigned long timeout;
         u8 issue_reset;
         u32 sz;
         void *psge;
@@ -914,8 +913,7 @@ _ctl_do_mpt_command(struct MPT3SAS_ADAPTER *ioc, struct mpt3_ioctl_command karg,
                 timeout = MPT3_IOCTL_DEFAULT_TIMEOUT;
         else
                 timeout = karg.timeout;
-        timeleft = wait_for_completion_timeout(&ioc->ctl_cmds.done,
-            timeout*HZ);
+        wait_for_completion_timeout(&ioc->ctl_cmds.done, timeout*HZ);
         if (mpi_request->Function == MPI2_FUNCTION_SCSI_TASK_MGMT) {
                 Mpi2SCSITaskManagementRequest_t *tm_request =
                     (Mpi2SCSITaskManagementRequest_t *)mpi_request;
@@ -938,7 +936,6 @@ _ctl_do_mpt_command(struct MPT3SAS_ADAPTER *ioc, struct mpt3_ioctl_command karg,
         }
 
         mpi_reply = ioc->ctl_cmds.reply;
-        ioc_status = le16_to_cpu(mpi_reply->IOCStatus) & MPI2_IOCSTATUS_MASK;
 
         if (mpi_reply->Function == MPI2_FUNCTION_SCSI_TASK_MGMT &&
             (ioc->logging_level & MPT_DEBUG_TM)) {
@@ -1001,13 +998,11 @@ _ctl_do_mpt_command(struct MPT3SAS_ADAPTER *ioc, struct mpt3_ioctl_command karg,
                                 ioc->name,
                                 le16_to_cpu(mpi_request->FunctionDependent1));
                         mpt3sas_halt_firmware(ioc);
-                        mpt3sas_scsih_issue_tm(ioc,
+                        mpt3sas_scsih_issue_locked_tm(ioc,
                             le16_to_cpu(mpi_request->FunctionDependent1), 0, 0,
-                            0, MPI2_SCSITASKMGMT_TASKTYPE_TARGET_RESET, 0, 30,
-                            TM_MUTEX_ON);
+                            0, MPI2_SCSITASKMGMT_TASKTYPE_TARGET_RESET, 0, 30);
                 } else
-                        mpt3sas_base_hard_reset_handler(ioc, CAN_SLEEP,
-                            FORCE_BIG_HAMMER);
+                        mpt3sas_base_hard_reset_handler(ioc, FORCE_BIG_HAMMER);
         }
 
  out:
@@ -1220,8 +1215,7 @@ _ctl_do_reset(struct MPT3SAS_ADAPTER *ioc, void __user *arg)
         dctlprintk(ioc, pr_info(MPT3SAS_FMT "%s: enter\n", ioc->name,
             __func__));
 
-        retval = mpt3sas_base_hard_reset_handler(ioc, CAN_SLEEP,
-            FORCE_BIG_HAMMER);
+        retval = mpt3sas_base_hard_reset_handler(ioc, FORCE_BIG_HAMMER);
         pr_info(MPT3SAS_FMT "host reset: %s\n",
             ioc->name, ((!retval) ? "SUCCESS" : "FAILED"));
         return 0;
@@ -1381,7 +1375,6 @@ _ctl_diag_register_2(struct MPT3SAS_ADAPTER *ioc,
         Mpi2DiagBufferPostRequest_t *mpi_request;
         Mpi2DiagBufferPostReply_t *mpi_reply;
         u8 buffer_type;
-        unsigned long timeleft;
         u16 smid;
         u16 ioc_status;
         u32 ioc_state;
@@ -1499,7 +1492,7 @@ _ctl_diag_register_2(struct MPT3SAS_ADAPTER *ioc,
 
         init_completion(&ioc->ctl_cmds.done);
         mpt3sas_base_put_smid_default(ioc, smid);
-        timeleft = wait_for_completion_timeout(&ioc->ctl_cmds.done,
+        wait_for_completion_timeout(&ioc->ctl_cmds.done,
             MPT3_IOCTL_DEFAULT_TIMEOUT*HZ);
 
         if (!(ioc->ctl_cmds.status & MPT3_CMD_COMPLETE)) {
@@ -1538,8 +1531,7 @@ _ctl_diag_register_2(struct MPT3SAS_ADAPTER *ioc,
 
  issue_host_reset:
         if (issue_reset)
-                mpt3sas_base_hard_reset_handler(ioc, CAN_SLEEP,
-                    FORCE_BIG_HAMMER);
+                mpt3sas_base_hard_reset_handler(ioc, FORCE_BIG_HAMMER);
 
  out:
 
@@ -1800,7 +1792,6 @@ mpt3sas_send_diag_release(struct MPT3SAS_ADAPTER *ioc, u8 buffer_type,
         u16 ioc_status;
         u32 ioc_state;
         int rc;
-        unsigned long timeleft;
 
         dctlprintk(ioc, pr_info(MPT3SAS_FMT "%s\n", ioc->name,
             __func__));
@@ -1848,7 +1839,7 @@ mpt3sas_send_diag_release(struct MPT3SAS_ADAPTER *ioc, u8 buffer_type,
 
         init_completion(&ioc->ctl_cmds.done);
         mpt3sas_base_put_smid_default(ioc, smid);
-        timeleft = wait_for_completion_timeout(&ioc->ctl_cmds.done,
+        wait_for_completion_timeout(&ioc->ctl_cmds.done,
             MPT3_IOCTL_DEFAULT_TIMEOUT*HZ);
 
         if (!(ioc->ctl_cmds.status & MPT3_CMD_COMPLETE)) {
@@ -1974,8 +1965,7 @@ _ctl_diag_release(struct MPT3SAS_ADAPTER *ioc, void __user *arg)
         rc = mpt3sas_send_diag_release(ioc, buffer_type, &issue_reset);
 
         if (issue_reset)
-                mpt3sas_base_hard_reset_handler(ioc, CAN_SLEEP,
-                    FORCE_BIG_HAMMER);
+                mpt3sas_base_hard_reset_handler(ioc, FORCE_BIG_HAMMER);
 
         return rc;
 }
@@ -1995,7 +1985,7 @@ _ctl_diag_read_buffer(struct MPT3SAS_ADAPTER *ioc, void __user *arg)
         Mpi2DiagBufferPostReply_t *mpi_reply;
         int rc, i;
         u8 buffer_type;
-        unsigned long timeleft, request_size, copy_size;
+        unsigned long request_size, copy_size;
         u16 smid;
         u16 ioc_status;
         u8 issue_reset = 0;
@@ -2116,7 +2106,7 @@ _ctl_diag_read_buffer(struct MPT3SAS_ADAPTER *ioc, void __user *arg)
 
         init_completion(&ioc->ctl_cmds.done);
         mpt3sas_base_put_smid_default(ioc, smid);
-        timeleft = wait_for_completion_timeout(&ioc->ctl_cmds.done,
+        wait_for_completion_timeout(&ioc->ctl_cmds.done,
             MPT3_IOCTL_DEFAULT_TIMEOUT*HZ);
 
         if (!(ioc->ctl_cmds.status & MPT3_CMD_COMPLETE)) {
@@ -2155,8 +2145,7 @@ _ctl_diag_read_buffer(struct MPT3SAS_ADAPTER *ioc, void __user *arg)
 
  issue_host_reset:
         if (issue_reset)
-                mpt3sas_base_hard_reset_handler(ioc, CAN_SLEEP,
-                    FORCE_BIG_HAMMER);
+                mpt3sas_base_hard_reset_handler(ioc, FORCE_BIG_HAMMER);
 
  out:
 
@@ -2352,7 +2341,7 @@ out_unlock_pciaccess:
  * @cmd - ioctl opcode
  * @arg -
  */
-long
+static long
 _ctl_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
         long ret;
@@ -2372,7 +2361,7 @@ _ctl_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
  * @cmd - ioctl opcode
  * @arg -
  */
-long
+static long
 _ctl_mpt2_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
         long ret;
@@ -2392,7 +2381,7 @@ _ctl_mpt2_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
  *
  * This routine handles 32 bit applications in 64bit os.
  */
-long
+static long
 _ctl_ioctl_compat(struct file *file, unsigned cmd, unsigned long arg)
 {
         long ret;
@@ -2410,7 +2399,7 @@ _ctl_ioctl_compat(struct file *file, unsigned cmd, unsigned long arg)
  *
  * This routine handles 32 bit applications in 64bit os.
  */
-long
+static long
 _ctl_mpt2_ioctl_compat(struct file *file, unsigned cmd, unsigned long arg)
 {
         long ret;