diff options
| author | Bjorn Andersson <bjorn.andersson@linaro.org> | 2020-05-17 23:10:41 -0700 |
|---|---|---|
| committer | Bjorn Andersson <bjorn.andersson@linaro.org> | 2020-05-17 23:13:00 -0700 |
| commit | 1f7a3eb785e4a4e196729cd3d5ec97bd5f9f2940 (patch) | |
| tree | 0ccec01b65ed07538fffa9bbe3dbf01678556ff5 | |
| parent | d2a8cfc6f320263b90ca523590a339661d0f4fae (diff) | |
Revert "soc: qcom: rpmh: Allow RPMH driver to be loaded as a module"qcom-drivers-for-5.8
Attempting to compile rpmh-rsc.c as a module with TRACING enabled causes
a build error as no _rcuidle function is generated for tracepoints when
CONFIG_MODULE is set.
Attempts has been made, but no resolution has been agreed upon, so lets
revert this commit for now.
This reverts commit 1d3c6f86fd3f8b88c707f56d8c3f94e014b40e83.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
| -rw-r--r-- | drivers/soc/qcom/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/soc/qcom/rpmh-rsc.c | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/drivers/soc/qcom/Kconfig b/drivers/soc/qcom/Kconfig index 0d0123f6ec0a..19332ea40234 100644 --- a/drivers/soc/qcom/Kconfig +++ b/drivers/soc/qcom/Kconfig @@ -107,7 +107,7 @@ config QCOM_RMTFS_MEM Say y here if you intend to boot the modem remoteproc. config QCOM_RPMH - tristate "Qualcomm RPM-Hardened (RPMH) Communication" + bool "Qualcomm RPM-Hardened (RPMH) Communication" depends on ARCH_QCOM && ARM64 || COMPILE_TEST help Support for communication with the hardened-RPM blocks in diff --git a/drivers/soc/qcom/rpmh-rsc.c b/drivers/soc/qcom/rpmh-rsc.c index 237d7d5cc8a8..076fd27f3081 100644 --- a/drivers/soc/qcom/rpmh-rsc.c +++ b/drivers/soc/qcom/rpmh-rsc.c @@ -13,7 +13,6 @@ #include <linux/iopoll.h> #include <linux/kernel.h> #include <linux/list.h> -#include <linux/module.h> #include <linux/of.h> #include <linux/of_irq.h> #include <linux/of_platform.h> @@ -1018,7 +1017,6 @@ static const struct of_device_id rpmh_drv_match[] = { { .compatible = "qcom,rpmh-rsc", }, { } }; -MODULE_DEVICE_TABLE(of, rpmh_drv_match); static struct platform_driver rpmh_driver = { .probe = rpmh_rsc_probe, @@ -1033,6 +1031,3 @@ static int __init rpmh_driver_init(void) return platform_driver_register(&rpmh_driver); } arch_initcall(rpmh_driver_init); - -MODULE_DESCRIPTION("Qualcomm Technologies, Inc. RPMh Driver"); -MODULE_LICENSE("GPL v2"); |