aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Chancellor <natechancellor@gmail.com>2018-09-19 20:22:21 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-09-29 09:01:10 -0400
commitd51aea13dd6753186a2bea7619029c460bdf0c4c (patch)
tree47374cdf51a1ac66d32b5ccd537900733485d241
parent6bf4ca7fbc85d80446ac01c0d1d77db4d91a6d84 (diff)
cpufreq: qcom-kryo: Fix section annotations
There is currently a warning when building the Kryo cpufreq driver into the kernel image: WARNING: vmlinux.o(.text+0x8aa424): Section mismatch in reference from the function qcom_cpufreq_kryo_probe() to the function .init.text:qcom_cpufreq_kryo_get_msm_id() The function qcom_cpufreq_kryo_probe() references the function __init qcom_cpufreq_kryo_get_msm_id(). This is often because qcom_cpufreq_kryo_probe lacks a __init annotation or the annotation of qcom_cpufreq_kryo_get_msm_id is wrong. Remove the '__init' annotation from qcom_cpufreq_kryo_get_msm_id so that there is no more mismatch warning. Additionally, Nick noticed that the remove function was marked as '__init' when it should really be marked as '__exit'. Fixes: 46e2856b8e18 (cpufreq: Add Kryo CPU scaling driver) Fixes: 5ad7346b4ae2 (cpufreq: kryo: Add module remove and exit) Reported-by: Nick Desaulniers <ndesaulniers@google.com> Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> Acked-by: Viresh Kumar <viresh.kumar@linaro.org> Cc: 4.18+ <stable@vger.kernel.org> # 4.18+ Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r--drivers/cpufreq/qcom-cpufreq-kryo.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/cpufreq/qcom-cpufreq-kryo.c b/drivers/cpufreq/qcom-cpufreq-kryo.c
index a1830fa25fc5..2a3675c24032 100644
--- a/drivers/cpufreq/qcom-cpufreq-kryo.c
+++ b/drivers/cpufreq/qcom-cpufreq-kryo.c
@@ -44,7 +44,7 @@ enum _msm8996_version {
44 44
45struct platform_device *cpufreq_dt_pdev, *kryo_cpufreq_pdev; 45struct platform_device *cpufreq_dt_pdev, *kryo_cpufreq_pdev;
46 46
47static enum _msm8996_version __init qcom_cpufreq_kryo_get_msm_id(void) 47static enum _msm8996_version qcom_cpufreq_kryo_get_msm_id(void)
48{ 48{
49 size_t len; 49 size_t len;
50 u32 *msm_id; 50 u32 *msm_id;
@@ -222,7 +222,7 @@ static int __init qcom_cpufreq_kryo_init(void)
222} 222}
223module_init(qcom_cpufreq_kryo_init); 223module_init(qcom_cpufreq_kryo_init);
224 224
225static void __init qcom_cpufreq_kryo_exit(void) 225static void __exit qcom_cpufreq_kryo_exit(void)
226{ 226{
227 platform_device_unregister(kryo_cpufreq_pdev); 227 platform_device_unregister(kryo_cpufreq_pdev);
228 platform_driver_unregister(&qcom_cpufreq_kryo_driver); 228 platform_driver_unregister(&qcom_cpufreq_kryo_driver);