Commit f67e8164 authored by Lee Jones's avatar Lee Jones Committed by Martin K. Petersen
Browse files

scsi: qla4xxx: Remove three set but unused variables 

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;
 | ^~~~

Link: https://lore.kernel.org/r/20200721164148.2617584-33-lee.jones@linaro.org


Cc: QLogic-Storage-Upstream@qlogic.com
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 5446a91d

drivers/scsi/qla4xxx/ql4_nx.c

+3 −6
Original line number Diff line number Diff line
@@ -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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE