[PATCH 38/40] scsi: sym53c8xx_2: sym_hipd: Ensure variable has the same stipulations as code using it

From: Lee Jones
Date: Tue Jul 21 2020 - 12:43:10 EST


Only declare 'tp' and 'lp' if they are going to be used.

Fixes the following W=1 kernel build warning(s):

drivers/scsi/sym53c8xx_2/sym_hipd.c: In function âsym_complete_errorâ:
drivers/scsi/sym53c8xx_2/sym_hipd.c:5356:18: warning: variable âlpâ set but not used [-Wunused-but-set-variable]
drivers/scsi/sym53c8xx_2/sym_hipd.c: In function âsym_complete_okâ:
drivers/scsi/sym53c8xx_2/sym_hipd.c:5485:18: warning: variable âlpâ set but not used [-Wunused-but-set-variable]

Cc: Matthew Wilcox <willy@xxxxxxxxxxxxx>
Cc: Gerard Roudier <groudier@xxxxxxx>
Cc: Wolfgang Stanglmeier <wolf@xxxxxxxxxx>
Cc: Stefan Esser <se@xxxxxxxxxxxxxxx>
Cc: Richard Waltham <dormouse@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Lee Jones <lee.jones@xxxxxxxxxx>
---
drivers/scsi/sym53c8xx_2/sym_hipd.c | 8 ++++++++
1 file changed, 8 insertions(+)

diff --git a/drivers/scsi/sym53c8xx_2/sym_hipd.c b/drivers/scsi/sym53c8xx_2/sym_hipd.c
index a428cae4535b7..8410117d5aa44 100644
--- a/drivers/scsi/sym53c8xx_2/sym_hipd.c
+++ b/drivers/scsi/sym53c8xx_2/sym_hipd.c
@@ -5352,8 +5352,10 @@ void sym_complete_error(struct sym_hcb *np, struct sym_ccb *cp)
{
struct scsi_device *sdev;
struct scsi_cmnd *cmd;
+#ifdef SYM_OPT_HANDLE_DEVICE_QUEUEING
struct sym_tcb *tp;
struct sym_lcb *lp;
+#endif
int resid;
int i;

@@ -5370,11 +5372,13 @@ void sym_complete_error(struct sym_hcb *np, struct sym_ccb *cp)
cp->host_status, cp->ssss_status, cp->host_flags);
}

+#ifdef SYM_OPT_HANDLE_DEVICE_QUEUEING
/*
* Get target and lun pointers.
*/
tp = &np->target[cp->target];
lp = sym_lp(tp, sdev->lun);
+#endif

/*
* Check for extended errors.
@@ -5481,8 +5485,10 @@ if (resid)
*/
void sym_complete_ok (struct sym_hcb *np, struct sym_ccb *cp)
{
+#ifdef SYM_OPT_HANDLE_DEVICE_QUEUEING
struct sym_tcb *tp;
struct sym_lcb *lp;
+#endif
struct scsi_cmnd *cmd;
int resid;

@@ -5498,11 +5504,13 @@ void sym_complete_ok (struct sym_hcb *np, struct sym_ccb *cp)
*/
cmd = cp->cmd;

+#ifdef SYM_OPT_HANDLE_DEVICE_QUEUEING
/*
* Get target and lun pointers.
*/
tp = &np->target[cp->target];
lp = sym_lp(tp, cp->lun);
+#endif

/*
* If all data have been transferred, given than no
--
2.25.1