Revert "soc: qcom: rpmh: Allow RPMH driver to be loaded as a module"

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>

diff --git a/drivers/soc/qcom/Kconfig b/drivers/soc/qcom/Kconfig
index 0d0123f6ec0add224de61778fc5d342b546e6344..19332ea4023441a75d39a4e678bf06a65c115ac7 100644 (file)
--- 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 237d7d5cc8a8319d6be4b49c7195c0ac3e95b841..076fd27f3081c138297dafae093ba5e0d6c985f6 100644 (file)
--- 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");