From: Tingwei Zhang <tingwei@codeaurora.org>
To: Mathieu Poirier <mathieu.poirier@linaro.org>,
Suzuki K Poulose <suzuki.poulose@arm.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Mike Leach <mike.leach@linaro.org>
Cc: tsoni@codeaurora.org,
Sai Prakash Ranjan <saiprakash.ranjan@codeaurora.org>,
Kim Phillips <kim.phillips@arm.com>,
Mao Jinlong <jinlmao@codeaurora.org>,
Suzuki K Poulose <Suzuki.Poulose@arm.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
coresight@lists.linaro.org, Randy Dunlap <rdunlap@infradead.org>,
Mian Yousaf Kaukab <ykaukab@suse.de>,
Russell King <linux@armlinux.org.uk>,
linux-kernel@vger.kernel.org,
Tingwei Zhang <tingwei@codeaurora.org>,
Leo Yan <leo.yan@linaro.org>,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH v11 03/24] coresight: use IS_ENABLED for CONFIGs that may be modules
Date: Tue, 15 Sep 2020 18:40:55 +0800 [thread overview]
Message-ID: <20200915104116.16789-4-tingwei@codeaurora.org> (raw)
In-Reply-To: <20200915104116.16789-1-tingwei@codeaurora.org>
From: Kim Phillips <kim.phillips@arm.com>
Checking for ifdef CONFIG_x fails if CONFIG_x=m. Use IS_ENABLED
that is true for both built-ins and modules, instead. Required
when building coresight components as modules.
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Suzuki K Poulose <Suzuki.Poulose@arm.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Russell King <linux@armlinux.org.uk>
Signed-off-by: Kim Phillips <kim.phillips@arm.com>
Signed-off-by: Tingwei Zhang <tingwei@codeaurora.org>
Reviewed-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org>
---
drivers/hwtracing/coresight/coresight-etm-perf.h | 2 +-
drivers/hwtracing/coresight/coresight-priv.h | 2 +-
include/linux/coresight.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/hwtracing/coresight/coresight-etm-perf.h b/drivers/hwtracing/coresight/coresight-etm-perf.h
index 015213abe00a..05f89723e282 100644
--- a/drivers/hwtracing/coresight/coresight-etm-perf.h
+++ b/drivers/hwtracing/coresight/coresight-etm-perf.h
@@ -57,7 +57,7 @@ struct etm_event_data {
struct list_head * __percpu *path;
};
-#ifdef CONFIG_CORESIGHT
+#if IS_ENABLED(CONFIG_CORESIGHT)
int etm_perf_symlink(struct coresight_device *csdev, bool link);
int etm_perf_add_symlink_sink(struct coresight_device *csdev);
void etm_perf_del_symlink_sink(struct coresight_device *csdev);
diff --git a/drivers/hwtracing/coresight/coresight-priv.h b/drivers/hwtracing/coresight/coresight-priv.h
index 5fe773c4d6cc..28695e26e5c6 100644
--- a/drivers/hwtracing/coresight/coresight-priv.h
+++ b/drivers/hwtracing/coresight/coresight-priv.h
@@ -166,7 +166,7 @@ int coresight_make_links(struct coresight_device *orig,
void coresight_remove_links(struct coresight_device *orig,
struct coresight_connection *conn);
-#ifdef CONFIG_CORESIGHT_SOURCE_ETM3X
+#if IS_ENABLED(CONFIG_CORESIGHT_SOURCE_ETM3X)
extern int etm_readl_cp14(u32 off, unsigned int *val);
extern int etm_writel_cp14(u32 off, u32 val);
#else
diff --git a/include/linux/coresight.h b/include/linux/coresight.h
index 58fffdecdbfd..3bb738f9a326 100644
--- a/include/linux/coresight.h
+++ b/include/linux/coresight.h
@@ -324,7 +324,7 @@ struct coresight_ops {
const struct coresight_ops_ect *ect_ops;
};
-#ifdef CONFIG_CORESIGHT
+#if IS_ENABLED(CONFIG_CORESIGHT)
extern struct coresight_device *
coresight_register(struct coresight_desc *desc);
extern void coresight_unregister(struct coresight_device *csdev);
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-09-15 10:44 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-15 10:40 [PATCH v11 00/24] coresight: allow to build coresight as modules Tingwei Zhang
2020-09-15 10:40 ` [PATCH v11 01/24] coresight: cpu_debug: add module name in Kconfig Tingwei Zhang
2020-09-15 10:40 ` [PATCH v11 02/24] coresight: cpu_debug: define MODULE_DEVICE_TABLE Tingwei Zhang
2020-09-15 10:40 ` Tingwei Zhang [this message]
2020-09-15 10:40 ` [PATCH v11 04/24] coresight: add coresight prefix to barrier_pkt Tingwei Zhang
2020-09-15 10:40 ` [PATCH v11 05/24] coresight: export global symbols Tingwei Zhang
2020-09-15 10:40 ` [PATCH v11 06/24] coresight: add try_get_module() in coresight_grab_device() Tingwei Zhang
2020-09-15 11:08 ` Suzuki K Poulose
2020-09-15 10:40 ` [PATCH v11 07/24] coresight: stm: allow to build coresight-stm as a module Tingwei Zhang
2020-09-15 10:41 ` [PATCH v11 08/24] coresight: etm: perf: Fix warning caused by etm_setup_aux failure Tingwei Zhang
2020-09-15 10:41 ` [PATCH v11 09/24] coresight: etm3x: allow etm3x to be built as a module Tingwei Zhang
2020-09-15 18:09 ` Mathieu Poirier
2020-09-22 21:42 ` Mathieu Poirier
2020-09-23 0:23 ` Tingwei Zhang
2020-09-15 10:41 ` [PATCH v11 10/24] coresight: etm4x: allow etm4x " Tingwei Zhang
2020-09-15 10:41 ` [PATCH v11 11/24] coresight: etb: allow etb " Tingwei Zhang
2020-09-15 10:41 ` [PATCH v11 12/24] coresight: tpiu: allow tpiu " Tingwei Zhang
2020-09-15 10:41 ` [PATCH v11 13/24] coresight: tmc: allow tmc " Tingwei Zhang
2020-09-15 10:41 ` [PATCH v11 14/24] coresight: allow funnel driver to be built as module Tingwei Zhang
2020-09-15 10:41 ` [PATCH v11 15/24] coresight: allow replicator " Tingwei Zhang
2020-09-15 11:25 ` Suzuki K Poulose
2020-09-15 10:41 ` [PATCH v11 16/24] coresight: cti: add function to register cti associate ops Tingwei Zhang
2020-09-15 10:41 ` [PATCH v11 17/24] coresight: cti: Fix remove sysfs link error Tingwei Zhang
2020-09-15 10:41 ` [PATCH v11 18/24] coresight: cti: Fix bug clearing sysfs links on callback Tingwei Zhang
2020-09-15 10:41 ` [PATCH v11 19/24] coresight: cti: don't disable ect device if it's not enabled Tingwei Zhang
2020-09-15 10:41 ` [PATCH v11 20/24] coresight: cti: increase reference count when enabling cti Tingwei Zhang
2020-09-15 10:41 ` [PATCH v11 21/24] coresight: cti: allow cti to be built as a module Tingwei Zhang
2020-09-15 10:41 ` [PATCH v11 22/24] coresight: tmc-etr: add function to register catu ops Tingwei Zhang
2020-09-15 10:41 ` [PATCH v11 23/24] coresight: catu: allow catu drivers to be built as modules Tingwei Zhang
2020-09-15 10:41 ` [PATCH v11 24/24] coresight: allow the coresight core driver to be built as a module Tingwei Zhang
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=20200915104116.16789-4-tingwei@codeaurora.org \
--to=tingwei@codeaurora.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=coresight@lists.linaro.org \
--cc=gregkh@linuxfoundation.org \
--cc=jinlmao@codeaurora.org \
--cc=kim.phillips@arm.com \
--cc=leo.yan@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=mathieu.poirier@linaro.org \
--cc=mike.leach@linaro.org \
--cc=rdunlap@infradead.org \
--cc=saiprakash.ranjan@codeaurora.org \
--cc=suzuki.poulose@arm.com \
--cc=tsoni@codeaurora.org \
--cc=ykaukab@suse.de \
/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).