From: Arnd Bergmann <arnd@arndb.de>
To: qla2xxx-upstream@qlogic.com,
"James E.J. Bottomley" <jejb@linux.vnet.ibm.com>,
"Martin K. Petersen" <martin.petersen@oracle.com>
Cc: Arnd Bergmann <arnd@arndb.de>, Quinn Tran <quinn.tran@cavium.com>,
Himanshu Madhani <himanshu.madhani@cavium.com>,
Nicholas Bellinger <nab@linux-iscsi.org>,
Darren Trapp <darren.trapp@cavium.com>,
Anil Gurumurthy <anil.gurumurhty@cavium.com>,
Duane Grigsby <duane.grigsby@cavium.com>,
linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 2/2] scsi: qla2xxx: avoid unused-function warning
Date: Fri, 30 Jun 2017 18:10:40 +0200 [thread overview]
Message-ID: <20170630161056.30630-2-arnd@arndb.de> (raw)
In-Reply-To: <20170630161056.30630-1-arnd@arndb.de>
When NVMe support is disabled, we get a couple of harmless warnings:
drivers/scsi/qla2xxx/qla_nvme.c:667:13: error: 'qla_nvme_unregister_remote_port' defined but not used [-Werror=unused-function]
drivers/scsi/qla2xxx/qla_nvme.c:634:13: error: 'qla_nvme_abort_all' defined but not used [-Werror=unused-function]
drivers/scsi/qla2xxx/qla_nvme.c:604:12: error: 'qla_nvme_wait_on_rport_del' defined but not used [-Werror=unused-function]
This replaces the preprocessor checks in the code with equivalent
compiler conditionals, which lets gcc drop the unused functions
without warning, and is nicer to read.
Fixes: e84067d74301 ("scsi: qla2xxx: Add FC-NVMe F/W initialization and transport registration")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/scsi/qla2xxx/Kconfig | 1 +
drivers/scsi/qla2xxx/qla_nvme.c | 20 ++++++++++++--------
2 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/drivers/scsi/qla2xxx/Kconfig b/drivers/scsi/qla2xxx/Kconfig
index de952935b5d2..036cc3f217b1 100644
--- a/drivers/scsi/qla2xxx/Kconfig
+++ b/drivers/scsi/qla2xxx/Kconfig
@@ -2,6 +2,7 @@ config SCSI_QLA_FC
tristate "QLogic QLA2XXX Fibre Channel Support"
depends on PCI && SCSI
depends on SCSI_FC_ATTRS
+ depends on NVME_FC || !NVME_FC
select FW_LOADER
select BTREE
---help---
diff --git a/drivers/scsi/qla2xxx/qla_nvme.c b/drivers/scsi/qla2xxx/qla_nvme.c
index 14e25e32e622..9c18d754ac33 100644
--- a/drivers/scsi/qla2xxx/qla_nvme.c
+++ b/drivers/scsi/qla2xxx/qla_nvme.c
@@ -17,10 +17,12 @@ static void qla_nvme_unregister_remote_port(struct work_struct *);
int qla_nvme_register_remote(scsi_qla_host_t *vha, fc_port_t *fcport)
{
-#if (IS_ENABLED(CONFIG_NVME_FC))
struct nvme_rport *rport;
int ret;
+ if (!IS_ENABLED(CONFIG_NVME_FC))
+ return 0;
+
if (fcport->nvme_flag & NVME_FLAG_REGISTERED)
return 0;
@@ -78,7 +80,6 @@ int qla_nvme_register_remote(scsi_qla_host_t *vha, fc_port_t *fcport)
init_waitqueue_head(&fcport->nvme_waitQ);
rport->fcport = fcport;
list_add_tail(&rport->list, &vha->nvme_rport_list);
-#endif
return 0;
}
@@ -666,11 +667,13 @@ static void qla_nvme_abort_all(fc_port_t *fcport)
static void qla_nvme_unregister_remote_port(struct work_struct *work)
{
-#if (IS_ENABLED(CONFIG_NVME_FC))
struct fc_port *fcport = container_of(work, struct fc_port,
nvme_del_work);
struct nvme_rport *rport, *trport;
+ if (!IS_ENABLED(CONFIG_NVME_FC))
+ return;
+
list_for_each_entry_safe(rport, trport,
&fcport->vha->nvme_rport_list, list) {
if (rport->fcport == fcport) {
@@ -680,16 +683,17 @@ static void qla_nvme_unregister_remote_port(struct work_struct *work)
fcport->nvme_remote_port);
}
}
-#endif
}
void qla_nvme_delete(scsi_qla_host_t *vha)
{
-#if (IS_ENABLED(CONFIG_NVME_FC))
struct nvme_rport *rport, *trport;
fc_port_t *fcport;
int nv_ret;
+ if (!IS_ENABLED(CONFIG_NVME_FC))
+ return;
+
list_for_each_entry_safe(rport, trport, &vha->nvme_rport_list, list) {
fcport = rport->fcport;
@@ -711,17 +715,18 @@ void qla_nvme_delete(scsi_qla_host_t *vha)
ql_log(ql_log_info, vha, 0x2115,
"Unregister of localport failed\n");
}
-#endif
}
void qla_nvme_register_hba(scsi_qla_host_t *vha)
{
-#if (IS_ENABLED(CONFIG_NVME_FC))
struct nvme_fc_port_template *tmpl;
struct qla_hw_data *ha;
struct nvme_fc_port_info pinfo;
int ret;
+ if (!IS_ENABLED(CONFIG_NVME_FC))
+ return;
+
ha = vha->hw;
tmpl = &qla_nvme_fc_transport;
@@ -752,5 +757,4 @@ void qla_nvme_register_hba(scsi_qla_host_t *vha)
atomic_set(&vha->nvme_ref_count, 1);
vha->nvme_local_port->private = vha;
init_waitqueue_head(&vha->nvme_waitQ);
-#endif
}
--
2.9.0
next prev parent reply other threads:[~2017-06-30 16:12 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-30 16:10 [PATCH 1/2] scsi: qla2xxx: remove incorrect byte swap Arnd Bergmann
2017-06-30 16:10 ` Arnd Bergmann [this message]
2017-06-30 23:54 ` [PATCH 2/2] scsi: qla2xxx: avoid unused-function warning Madhani, Himanshu
2017-07-01 21:15 ` Martin K. Petersen
2017-06-30 16:41 ` [PATCH 1/2] scsi: qla2xxx: remove incorrect byte swap James Bottomley
2017-06-30 17:00 ` Madhani, Himanshu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170630161056.30630-2-arnd@arndb.de \
--to=arnd@arndb.de \
--cc=anil.gurumurhty@cavium.com \
--cc=darren.trapp@cavium.com \
--cc=duane.grigsby@cavium.com \
--cc=himanshu.madhani@cavium.com \
--cc=jejb@linux.vnet.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=nab@linux-iscsi.org \
--cc=qla2xxx-upstream@qlogic.com \
--cc=quinn.tran@cavium.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).