aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBart Van Assche <bart.vanassche@sandisk.com>2016-03-30 18:25:21 -0400
committerBart Van Assche <bart.vanassche@sandisk.com>2017-01-17 14:26:47 -0500
commit91f42b33e5b48a956a352ce10da52b77f4277d5f (patch)
tree5c78bad9090616e25c8c9fb0805f5ecaaf217c18
parent61778a1c5a4556da1a1e005d506f89f009031e62 (diff)
qla2xxx: Avoid that building with W=1 triggers complaints about set-but-not-used variables
Remove two set-but-not-used variables and avoid that the compiler warns about a third variable (rc). Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com> Acked-by: Himanshu Madhani <himanshu.madhani@qlogic.com> Cc: Quinn Tran <quinn.tran@qlogic.com> Cc: Christoph Hellwig <hch@lst.de>
-rw-r--r--drivers/scsi/qla2xxx/qla_attr.c3
-rw-r--r--drivers/scsi/qla2xxx/qla_mbx.c2
-rw-r--r--drivers/scsi/qla2xxx/qla_target.c3
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
index 47eb4d545d13..fefff506a08f 100644
--- a/drivers/scsi/qla2xxx/qla_attr.c
+++ b/drivers/scsi/qla2xxx/qla_attr.c
@@ -753,7 +753,6 @@ qla2x00_issue_logo(struct file *filp, struct kobject *kobj,
753 struct scsi_qla_host *vha = shost_priv(dev_to_shost(container_of(kobj, 753 struct scsi_qla_host *vha = shost_priv(dev_to_shost(container_of(kobj,
754 struct device, kobj))); 754 struct device, kobj)));
755 int type; 755 int type;
756 int rval = 0;
757 port_id_t did; 756 port_id_t did;
758 757
759 type = simple_strtol(buf, NULL, 10); 758 type = simple_strtol(buf, NULL, 10);
@@ -767,7 +766,7 @@ qla2x00_issue_logo(struct file *filp, struct kobject *kobj,
767 766
768 ql_log(ql_log_info, vha, 0x70e4, "%s: %d\n", __func__, type); 767 ql_log(ql_log_info, vha, 0x70e4, "%s: %d\n", __func__, type);
769 768
770 rval = qla24xx_els_dcmd_iocb(vha, ELS_DCMD_LOGO, did); 769 qla24xx_els_dcmd_iocb(vha, ELS_DCMD_LOGO, did);
771 return count; 770 return count;
772} 771}
773 772
diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
index b3a9f6a40a44..34de6d7e5262 100644
--- a/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/drivers/scsi/qla2xxx/qla_mbx.c
@@ -684,7 +684,6 @@ qla_set_exlogin_mem_cfg(scsi_qla_host_t *vha, dma_addr_t phys_addr)
684 mbx_cmd_t mc; 684 mbx_cmd_t mc;
685 mbx_cmd_t *mcp = &mc; 685 mbx_cmd_t *mcp = &mc;
686 struct qla_hw_data *ha = vha->hw; 686 struct qla_hw_data *ha = vha->hw;
687 int configured_count;
688 687
689 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x111a, 688 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x111a,
690 "Entered %s.\n", __func__); 689 "Entered %s.\n", __func__);
@@ -707,7 +706,6 @@ qla_set_exlogin_mem_cfg(scsi_qla_host_t *vha, dma_addr_t phys_addr)
707 /*EMPTY*/ 706 /*EMPTY*/
708 ql_dbg(ql_dbg_mbx, vha, 0x111b, "Failed=%x.\n", rval); 707 ql_dbg(ql_dbg_mbx, vha, 0x111b, "Failed=%x.\n", rval);
709 } else { 708 } else {
710 configured_count = mcp->mb[11];
711 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x118c, 709 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x118c,
712 "Done %s.\n", __func__); 710 "Done %s.\n", __func__);
713 } 711 }
diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c
index bff9689f5ca9..7e0345d7a8d6 100644
--- a/drivers/scsi/qla2xxx/qla_target.c
+++ b/drivers/scsi/qla2xxx/qla_target.c
@@ -3110,6 +3110,9 @@ static void qlt_send_term_imm_notif(struct scsi_qla_host *vha,
3110#if 0 /* Todo */ 3110#if 0 /* Todo */
3111 if (rc == -ENOMEM) 3111 if (rc == -ENOMEM)
3112 qlt_alloc_qfull_cmd(vha, imm, 0, 0); 3112 qlt_alloc_qfull_cmd(vha, imm, 0, 0);
3113#else
3114 if (rc) {
3115 }
3113#endif 3116#endif
3114 goto done; 3117 goto done;
3115 } 3118 }