[PATCH 32/40] scsi: qla4xxx: ql4_nx: Remove three set but unused variables

From: Lee Jones
Date: Tue Jul 21 2020 - 12:42:48 EST


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

drivers/scsi/qla4xxx/ql4_nx.c: In function âqla4_84xx_minidump_process_rddfeâ:
drivers/scsi/qla4xxx/ql4_nx.c:2648:23: warning: variable âdata_sizeâ set but not used [-Wunused-but-set-variable]
2648 | uint32_t poll, mask, data_size, modify_mask;
| ^~~~~~~~~
drivers/scsi/qla4xxx/ql4_nx.c: In function âqla4_84xx_minidump_process_rdmdioâ:
drivers/scsi/qla4xxx/ql4_nx.c:2745:11: warning: variable âpollâ set but not used [-Wunused-but-set-variable]
2745 | uint32_t poll, mask;
| ^~~~
drivers/scsi/qla4xxx/ql4_nx.c: In function âqla4_84xx_minidump_process_pollwrâ:
drivers/scsi/qla4xxx/ql4_nx.c:2816:47: warning: variable âmaskâ set but not used [-Wunused-but-set-variable]
2816 | uint32_t addr1, addr2, value1, value2, poll, mask, r_value;
| ^~~~

Cc: QLogic-Storage-Upstream@xxxxxxxxxx
Signed-off-by: Lee Jones <lee.jones@xxxxxxxxxx>
---
drivers/scsi/qla4xxx/ql4_nx.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/scsi/qla4xxx/ql4_nx.c b/drivers/scsi/qla4xxx/ql4_nx.c
index 5a31877c9d04f..85666fb5471b1 100644
--- a/drivers/scsi/qla4xxx/ql4_nx.c
+++ b/drivers/scsi/qla4xxx/ql4_nx.c
@@ -2645,7 +2645,7 @@ static uint32_t qla4_84xx_minidump_process_rddfe(struct scsi_qla_host *ha,
uint32_t addr1, addr2, value, data, temp, wrval;
uint8_t stride, stride2;
uint16_t count;
- uint32_t poll, mask, data_size, modify_mask;
+ uint32_t poll, mask, modify_mask;
uint32_t wait_count = 0;
uint32_t *data_ptr = *d_ptr;
struct qla8044_minidump_entry_rddfe *rddfe;
@@ -2661,7 +2661,6 @@ static uint32_t qla4_84xx_minidump_process_rddfe(struct scsi_qla_host *ha,
poll = le32_to_cpu(rddfe->poll);
mask = le32_to_cpu(rddfe->mask);
modify_mask = le32_to_cpu(rddfe->modify_mask);
- data_size = le32_to_cpu(rddfe->data_size);

addr2 = addr1 + stride;

@@ -2742,7 +2741,7 @@ static uint32_t qla4_84xx_minidump_process_rdmdio(struct scsi_qla_host *ha,
uint8_t stride1, stride2;
uint32_t addr3, addr4, addr5, addr6, addr7;
uint16_t count, loop_cnt;
- uint32_t poll, mask;
+ uint32_t mask;
uint32_t *data_ptr = *d_ptr;
struct qla8044_minidump_entry_rdmdio *rdmdio;

@@ -2754,7 +2753,6 @@ static uint32_t qla4_84xx_minidump_process_rdmdio(struct scsi_qla_host *ha,
stride2 = le32_to_cpu(rdmdio->stride_2);
count = le32_to_cpu(rdmdio->count);

- poll = le32_to_cpu(rdmdio->poll);
mask = le32_to_cpu(rdmdio->mask);
value2 = le32_to_cpu(rdmdio->value_2);

@@ -2813,7 +2811,7 @@ static uint32_t qla4_84xx_minidump_process_pollwr(struct scsi_qla_host *ha,
struct qla8xxx_minidump_entry_hdr *entry_hdr,
uint32_t **d_ptr)
{
- uint32_t addr1, addr2, value1, value2, poll, mask, r_value;
+ uint32_t addr1, addr2, value1, value2, poll, r_value;
struct qla8044_minidump_entry_pollwr *pollwr_hdr;
uint32_t wait_count = 0;
uint32_t rval = QLA_SUCCESS;
@@ -2825,7 +2823,6 @@ static uint32_t qla4_84xx_minidump_process_pollwr(struct scsi_qla_host *ha,
value2 = le32_to_cpu(pollwr_hdr->value_2);

poll = le32_to_cpu(pollwr_hdr->poll);
- mask = le32_to_cpu(pollwr_hdr->mask);

while (wait_count < poll) {
ha->isp_ops->rd_reg_indirect(ha, addr1, &r_value);
--
2.25.1