mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Ren Zhijie <renzhijie2@huawei.com>
To: <njavali@marvell.com>, <GR-QLogic-Storage-Upstream@marvell.com>,
	<jejb@linux.ibm.com>, <martin.petersen@oracle.com>,
	<aeasi@marvell.com>, <dwagner@suse.de>,
	<himanshu.madhani@oracle.com>
Cc: <linux-scsi@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
	Ren Zhijie <renzhijie2@huawei.com>
Subject: [PATCH -next] scsi: qla2xxx: Fix build error implicit-function-declaration
Date: Mon, 19 Sep 2022 11:08:10 +0800	[thread overview]
Message-ID: <20220919030810.1626-1-renzhijie2@huawei.com> (raw)

If CONFIG_TRACING is not set,
make ARCH=x86_64 CROSS_COMPILE=x86_64-linux-gnu-,
will be failed, like this:

drivers/scsi/qla2xxx/qla_os.c: In function ‘qla_trace_init’:
drivers/scsi/qla2xxx/qla_os.c:2854:18: error: implicit declaration of function ‘trace_array_get_by_name’; did you mean ‘trace_array_set_clr_event’? [-Werror=implicit-function-declaration]
  qla_trc_array = trace_array_get_by_name("qla2xxx");
                  ^~~~~~~~~~~~~~~~~~~~~~~
                  trace_array_set_clr_event
drivers/scsi/qla2xxx/qla_os.c:2854:16: error: assignment makes pointer from integer without a cast [-Werror=int-conversion]
  qla_trc_array = trace_array_get_by_name("qla2xxx");
                ^
drivers/scsi/qla2xxx/qla_os.c: In function ‘qla_trace_uninit’:
drivers/scsi/qla2xxx/qla_os.c:2869:2: error: implicit declaration of function ‘trace_array_put’; did you mean ‘trace_seq_putc’? [-Werror=implicit-function-declaration]
  trace_array_put(qla_trc_array);
  ^~~~~~~~~~~~~~~
  trace_seq_putc
cc1: all warnings being treated as errors

To fix this error, wrap up all the relevant code with CONFIG_TRACING.

Fixes: 8bfc149ba24c ("scsi: qla2xxx: Enhance driver tracing with separate tunable and more")
Signed-off-by: Ren Zhijie <renzhijie2@huawei.com>
---
 drivers/scsi/qla2xxx/qla_os.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 2c85f3cce726..e445105ee16d 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -37,7 +37,9 @@ static int apidev_major;
  */
 struct kmem_cache *srb_cachep;
 
+#ifdef CONFIG_TRACING
 static struct trace_array *qla_trc_array;
+#endif
 
 int ql2xfulldump_on_mpifail;
 module_param(ql2xfulldump_on_mpifail, int, S_IRUGO | S_IWUSR);
@@ -2848,6 +2850,7 @@ static void qla2x00_iocb_work_fn(struct work_struct *work)
 	spin_unlock_irqrestore(&vha->work_lock, flags);
 }
 
+#ifdef CONFIG_TRACING
 static void
 qla_trace_init(void)
 {
@@ -2868,7 +2871,7 @@ qla_trace_uninit(void)
 		return;
 	trace_array_put(qla_trc_array);
 }
-
+#endif
 /*
  * PCI driver interface
  */
@@ -8209,7 +8212,9 @@ qla2x00_module_init(void)
 	BUILD_BUG_ON(sizeof(sw_info_t) != 32);
 	BUILD_BUG_ON(sizeof(target_id_t) != 2);
 
+#ifdef CONFIG_TRACING
 	qla_trace_init();
+#endif
 
 	/* Allocate cache for SRBs. */
 	srb_cachep = kmem_cache_create("qla2xxx_srbs", sizeof(srb_t), 0,
@@ -8290,7 +8295,9 @@ qla2x00_module_init(void)
 destroy_cache:
 	kmem_cache_destroy(srb_cachep);
 
+#ifdef CONFIG_TRACING
 	qla_trace_uninit();
+#endif
 	return ret;
 }
 
@@ -8309,7 +8316,9 @@ qla2x00_module_exit(void)
 	fc_release_transport(qla2xxx_transport_template);
 	qlt_exit();
 	kmem_cache_destroy(srb_cachep);
+#ifdef CONFIG_TRACING
 	qla_trace_uninit();
+#endif
 }
 
 module_init(qla2x00_module_init);
-- 
2.17.1


             reply	other threads:[~2022-09-19  3:12 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-19  3:08 Ren Zhijie [this message]
2022-09-19  7:17 ` Daniel Wagner
2022-09-19 13:20   ` Ren Zhijie

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=20220919030810.1626-1-renzhijie2@huawei.com \
    --to=renzhijie2@huawei.com \
    --cc=GR-QLogic-Storage-Upstream@marvell.com \
    --cc=aeasi@marvell.com \
    --cc=dwagner@suse.de \
    --cc=himanshu.madhani@oracle.com \
    --cc=jejb@linux.ibm.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-scsi@vger.kernel.org \
    --cc=martin.petersen@oracle.com \
    --cc=njavali@marvell.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

all inboxes | Powered by JetHome®