scsi: mpt3sas: Fix set but unused variable

In _config_request(), the variable issue_reset is set using the macro
mpt3sas_check_cmd_timeout() but otherwise unused, causing a compiler
warning when compiling with W=1. Avoid this warning by removing this
variable, using the function mpt3sas_base_check_cmd_timeout() directly
instead of the mpt3sas_check_cmd_timeout() macro.

Link: https://lore.kernel.org/r/20200706123356.452135-1-damien.lemoal@wdc.com
Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/mpt3sas/mpt3sas_config.c b/drivers/scsi/mpt3sas/mpt3sas_config.c
index 62ddf53ab3aea1b742d5a1373ce48202411d9ba3..11026e0ef3d05f206734d3d14ebdfb4f5fe48a35 100644 (file)
--- a/drivers/scsi/mpt3sas/mpt3sas_config.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_config.c
@@ -303,7 +303,6 @@ _config_request(struct MPT3SAS_ADAPTER *ioc, Mpi2ConfigRequest_t
        u8 retry_count, issue_host_reset = 0;
        struct config_request mem;
        u32 ioc_status = UINT_MAX;
-       u8 issue_reset = 0;
 
        mutex_lock(&ioc->config_cmds.mutex);
        if (ioc->config_cmds.status != MPT3_CMD_NOT_USED) {
@@ -386,9 +385,9 @@ _config_request(struct MPT3SAS_ADAPTER *ioc, Mpi2ConfigRequest_t
                if (!(ioc->logging_level & MPT_DEBUG_CONFIG))
                        _config_display_some_debug(ioc,
                            smid, "config_request", NULL);
-               mpt3sas_check_cmd_timeout(ioc,
-                   ioc->config_cmds.status, mpi_request,
-                   sizeof(Mpi2ConfigRequest_t)/4, issue_reset);
+               ioc_err(ioc, "%s: command timeout\n", __func__);
+               mpt3sas_base_check_cmd_timeout(ioc, ioc->config_cmds.status,
+                               mpi_request, sizeof(Mpi2ConfigRequest_t) / 4);
                retry_count++;
                if (ioc->config_cmds.smid == smid)
                        mpt3sas_base_free_smid(ioc, smid);