| Message ID | 20240807094000.398857-1-leitao@debian.org |
|---|---|
| State | New |
| Headers | show |
| Series | scsi: message: fusion: Remove unused variable | expand |
Breno, > There are two unused variable in mptsas, and the compiler complains > about it. Let's get them removed. Applied to 6.12/scsi-staging, thanks!
> Applied to 6.12/scsi-staging, thanks!
drivers/message/fusion/mptsas.c: In function ‘mptsas_reprobe_lun’:
drivers/message/fusion/mptsas.c:4235:9: error: ignoring return value of ‘scsi_device_reprobe’ declared with attribute ‘warn_unused_result’ [-Werror=unused-result]
4235 | scsi_device_reprobe(sdev);
| ^~~~~~~~~~~~~~~~~~~~~~~~~
Dropped again.
On Mon, Aug 12, 2024 at 09:42:33PM -0400, Martin K. Petersen wrote: > > > Applied to 6.12/scsi-staging, thanks! > > drivers/message/fusion/mptsas.c: In function ‘mptsas_reprobe_lun’: > drivers/message/fusion/mptsas.c:4235:9: error: ignoring return value of ‘scsi_device_reprobe’ declared with attribute ‘warn_unused_result’ [-Werror=unused-result] > 4235 | scsi_device_reprobe(sdev); > | ^~~~~~~~~~~~~~~~~~~~~~~~~ > Let me handle it, and send a v2. Thanks --breno
diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c index a0bcb0864ecd..cd920faff16a 100644 --- a/drivers/message/fusion/mptsas.c +++ b/drivers/message/fusion/mptsas.c @@ -4231,10 +4231,8 @@ mptsas_find_phyinfo_by_phys_disk_num(MPT_ADAPTER *ioc, u8 phys_disk_num, static void mptsas_reprobe_lun(struct scsi_device *sdev, void *data) { - int rc; - sdev->no_uld_attach = data ? 1 : 0; - rc = scsi_device_reprobe(sdev); + scsi_device_reprobe(sdev); } static void @@ -4790,7 +4788,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); @@ -4826,8 +4823,7 @@ 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); + 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
There are two unused variable in mptsas, and the compiler complains about it. Let's get them removed. drivers/message/fusion/mptsas.c:4234:6: warning: variable 'rc' set but not used [-Wunused-but-set-variable] 4234 | int rc; drivers/message/fusion/mptsas.c:4793:17: warning: variable 'timeleft' set but not used [-Wunused-but-set-variable] 4793 | unsigned long timeleft; Signed-off-by: Breno Leitao <leitao@debian.org> --- drivers/message/fusion/mptsas.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)