| Message ID | 20230331162617.1858394-1-trix@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | scsi: message: fusion: remove unused timeleft variable | expand |
On Fri, Mar 31, 2023 at 9:26 AM Tom Rix <trix@redhat.com> wrote: > > clang with W=1 reports > drivers/message/fusion/mptsas.c:4796:17: error: variable > 'timeleft' set but not used [-Werror,-Wunused-but-set-variable] > unsigned long timeleft; > ^ > This variable is not used so remove it. > > Signed-off-by: Tom Rix <trix@redhat.com> > --- > drivers/message/fusion/mptsas.c | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c > index 86f16f3ea478..d458665e2fc9 100644 > --- a/drivers/message/fusion/mptsas.c > +++ b/drivers/message/fusion/mptsas.c > @@ -4793,7 +4793,6 @@ mptsas_issue_tm(MPT_ADAPTER *ioc, u8 type, u8 channel, u8 id, u64 lun, > MPT_FRAME_HDR *mf; > SCSITaskMgmt_t *pScsiTm; > int retval; > - unsigned long timeleft; > > *issue_reset = 0; > mf = mpt_get_msg_frame(mptsasDeviceResetCtx, ioc); > @@ -4829,8 +4828,6 @@ mptsas_issue_tm(MPT_ADAPTER *ioc, u8 type, u8 channel, u8 id, u64 lun, > mpt_put_msg_frame_hi_pri(mptsasDeviceResetCtx, ioc, mf); > > /* Now wait for the command to complete */ > - timeleft = wait_for_completion_timeout(&ioc->taskmgmt_cmds.done, > - timeout*HZ); It looks bad to remove the call to wait_for_completion_timeout(). Is it truly not needed? If it's needed, the "timeleft" should be checked or a comment left to explain why it's not checked. -bw > if (!(ioc->taskmgmt_cmds.status & MPT_MGMT_STATUS_COMMAND_GOOD)) { > retval = -1; /* return failure */ > dtmprintk(ioc, printk(MYIOC_s_ERR_FMT > -- > 2.27.0 > >
On 3/31/23 12:40 PM, Bill Wendling wrote: > On Fri, Mar 31, 2023 at 9:26 AM Tom Rix <trix@redhat.com> wrote: >> clang with W=1 reports >> drivers/message/fusion/mptsas.c:4796:17: error: variable >> 'timeleft' set but not used [-Werror,-Wunused-but-set-variable] >> unsigned long timeleft; >> ^ >> This variable is not used so remove it. >> >> Signed-off-by: Tom Rix <trix@redhat.com> >> --- >> drivers/message/fusion/mptsas.c | 3 --- >> 1 file changed, 3 deletions(-) >> >> diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c >> index 86f16f3ea478..d458665e2fc9 100644 >> --- a/drivers/message/fusion/mptsas.c >> +++ b/drivers/message/fusion/mptsas.c >> @@ -4793,7 +4793,6 @@ mptsas_issue_tm(MPT_ADAPTER *ioc, u8 type, u8 channel, u8 id, u64 lun, >> MPT_FRAME_HDR *mf; >> SCSITaskMgmt_t *pScsiTm; >> int retval; >> - unsigned long timeleft; >> >> *issue_reset = 0; >> mf = mpt_get_msg_frame(mptsasDeviceResetCtx, ioc); >> @@ -4829,8 +4828,6 @@ mptsas_issue_tm(MPT_ADAPTER *ioc, u8 type, u8 channel, u8 id, u64 lun, >> mpt_put_msg_frame_hi_pri(mptsasDeviceResetCtx, ioc, mf); >> >> /* Now wait for the command to complete */ >> - timeleft = wait_for_completion_timeout(&ioc->taskmgmt_cmds.done, >> - timeout*HZ); > It looks bad to remove the call to wait_for_completion_timeout(). Is > it truly not needed? If it's needed, the "timeleft" should be checked > or a comment left to explain why it's not checked. Yeah. this is a screw up on my part, sorry. T > > -bw > >> if (!(ioc->taskmgmt_cmds.status & MPT_MGMT_STATUS_COMMAND_GOOD)) { >> retval = -1; /* return failure */ >> dtmprintk(ioc, printk(MYIOC_s_ERR_FMT >> -- >> 2.27.0 >> >>
diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c index 86f16f3ea478..d458665e2fc9 100644 --- a/drivers/message/fusion/mptsas.c +++ b/drivers/message/fusion/mptsas.c @@ -4793,7 +4793,6 @@ mptsas_issue_tm(MPT_ADAPTER *ioc, u8 type, u8 channel, u8 id, u64 lun, MPT_FRAME_HDR *mf; SCSITaskMgmt_t *pScsiTm; int retval; - unsigned long timeleft; *issue_reset = 0; mf = mpt_get_msg_frame(mptsasDeviceResetCtx, ioc); @@ -4829,8 +4828,6 @@ mptsas_issue_tm(MPT_ADAPTER *ioc, u8 type, u8 channel, u8 id, u64 lun, mpt_put_msg_frame_hi_pri(mptsasDeviceResetCtx, ioc, mf); /* Now wait for the command to complete */ - timeleft = wait_for_completion_timeout(&ioc->taskmgmt_cmds.done, - timeout*HZ); if (!(ioc->taskmgmt_cmds.status & MPT_MGMT_STATUS_COMMAND_GOOD)) { retval = -1; /* return failure */ dtmprintk(ioc, printk(MYIOC_s_ERR_FMT
clang with W=1 reports drivers/message/fusion/mptsas.c:4796:17: error: variable 'timeleft' set but not used [-Werror,-Wunused-but-set-variable] unsigned long timeleft; ^ This variable is not used so remove it. Signed-off-by: Tom Rix <trix@redhat.com> --- drivers/message/fusion/mptsas.c | 3 --- 1 file changed, 3 deletions(-)