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>,
Tingwei Zhang <tingwei@codeaurora.org>,
Leo Yan <leo.yan@linaro.org>,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH v4 03/20] coresight: use IS_ENABLED for CONFIGs that may be modules
Date: Thu, 23 Jul 2020 12:27:45 +0800 [thread overview]
Message-ID: <20200723042802.22511-4-tingwei@codeaurora.org> (raw)
In-Reply-To: <20200723042802.22511-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>
---
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 f2dc625ea585..d801a2755432 100644
--- a/drivers/hwtracing/coresight/coresight-priv.h
+++ b/drivers/hwtracing/coresight/coresight-priv.h
@@ -165,7 +165,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-07-23 4:30 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-23 4:27 [PATCH v4 00/20] coresight: allow to build coresight as modules Tingwei Zhang
2020-07-23 4:27 ` [PATCH v4 01/20] coresight: cpu_debug: add module name in Kconfig Tingwei Zhang
2020-07-23 4:27 ` [PATCH v4 02/20] coresight: cpu_debug: define MODULE_DEVICE_TABLE Tingwei Zhang
2020-07-23 4:27 ` Tingwei Zhang [this message]
2020-07-23 4:27 ` [PATCH v4 04/20] coresight: add coresight prefix to barrier_pkt Tingwei Zhang
2020-07-23 4:27 ` [PATCH v4 05/20] coresight: export global symbols Tingwei Zhang
2020-07-23 4:27 ` [PATCH v4 06/20] coresight: add try_get_module() in coresight_grab_device() Tingwei Zhang
2020-07-23 10:55 ` Mike Leach
2020-07-25 10:05 ` Tingwei Zhang
2020-07-25 13:51 ` Mike Leach
2020-07-26 1:32 ` Tingwei Zhang
2020-07-27 17:04 ` Mike Leach
2020-07-28 1:07 ` Tingwei Zhang
2020-07-28 10:08 ` Mike Leach
2020-07-28 11:17 ` Tingwei Zhang
2020-07-28 20:25 ` Mike Leach
2020-07-23 11:07 ` Greg Kroah-Hartman
2020-07-23 18:04 ` Mathieu Poirier
2020-07-23 18:18 ` Greg Kroah-Hartman
2020-07-23 19:15 ` Mathieu Poirier
2020-07-24 0:41 ` Tingwei Zhang
2020-07-24 7:36 ` Tingwei Zhang
2020-07-23 4:27 ` [PATCH v4 07/20] allow to build coresight-stm as a module, for ease of development Tingwei Zhang
2020-07-23 4:27 ` [PATCH v4 08/20] coresight: allow etm3x to be built as a module Tingwei Zhang
2020-07-23 4:27 ` [PATCH v4 09/20] coresight: allow etm4x " Tingwei Zhang
2020-07-23 4:27 ` [PATCH v4 10/20] coresight: allow etb " Tingwei Zhang
2020-07-23 4:27 ` [PATCH v4 11/20] coresight: allow tpiu " Tingwei Zhang
2020-07-23 4:27 ` [PATCH v4 12/20] coresight: allow tmc " Tingwei Zhang
2020-07-23 4:27 ` [PATCH v4 13/20] coresight: remove multiple init calls from funnel driver Tingwei Zhang
2020-07-23 4:27 ` [PATCH v4 14/20] coresight: remove multiple init calls from replicator driver Tingwei Zhang
2020-07-23 4:27 ` [PATCH v4 15/20] coresight: allow funnel and replicator drivers to be built as modules Tingwei Zhang
2020-07-23 4:27 ` [PATCH v4 16/20] coresight: cti: add function to register cti associate ops Tingwei Zhang
2020-07-23 4:27 ` [PATCH v4 17/20] coresight: allow cti to be built as a module Tingwei Zhang
2020-07-23 4:28 ` [PATCH v4 18/20] coresight: tmc-etr: add function to register catu ops Tingwei Zhang
2020-07-23 4:28 ` [PATCH v4 19/20] coresight: allow catu drivers to be built as modules Tingwei Zhang
2020-07-23 4:28 ` [PATCH v4 20/20] coresight: allow the coresight core driver to be built as a module Tingwei Zhang
2020-07-23 11:03 ` [PATCH v4 00/20] coresight: allow to build coresight as modules Mike Leach
2020-07-24 0:37 ` 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=20200723042802.22511-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@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).