diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-09-29 06:50:36 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-09-29 06:50:36 -0700 |
| commit | 82ec752cce8b19b69efcfc96303b2ed33e01fd48 (patch) | |
| tree | 672b7cca6966517c2a8a769c8c38219ee900bf2e | |
| parent | 7a6878bb4e7ac410b8748e115df8265cf32b1be3 (diff) | |
| parent | d51aea13dd6753186a2bea7619029c460bdf0c4c (diff) | |
| download | linux-82ec752cce8b19b69efcfc96303b2ed33e01fd48.tar.gz linux-82ec752cce8b19b69efcfc96303b2ed33e01fd48.tar.bz2 linux-82ec752cce8b19b69efcfc96303b2ed33e01fd48.zip | |
Merge tag 'pm-4.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Rafael writes:
"Power management fix for 4.19-rc6
Fix incorrect __init and __exit annotations in the Qualcomm
Kryo cpufreq driver (Nathan Chancellor)."
* tag 'pm-4.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
cpufreq: qcom-kryo: Fix section annotations
| -rw-r--r-- | drivers/cpufreq/qcom-cpufreq-kryo.c | 4 |
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 { struct platform_device *cpufreq_dt_pdev, *kryo_cpufreq_pdev; -static enum _msm8996_version __init qcom_cpufreq_kryo_get_msm_id(void) +static enum _msm8996_version qcom_cpufreq_kryo_get_msm_id(void) { size_t len; u32 *msm_id; @@ -222,7 +222,7 @@ static int __init qcom_cpufreq_kryo_init(void) } module_init(qcom_cpufreq_kryo_init); -static void __init qcom_cpufreq_kryo_exit(void) +static void __exit qcom_cpufreq_kryo_exit(void) { platform_device_unregister(kryo_cpufreq_pdev); platform_driver_unregister(&qcom_cpufreq_kryo_driver); |