Merge tag 'pm-4.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

gregkh · gregkh · commit 82ec752cce8b · 2018-09-29T06:50:36.000-07:00
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
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ enum _msm8996_version {`
`44`	`44`
`45`	`45`	`struct platform_device cpufreq_dt_pdev, kryo_cpufreq_pdev;`
`46`	`46`
`47`		`-static enum _msm8996_version __init qcom_cpufreq_kryo_get_msm_id(void)`
	`47`	`+static enum _msm8996_version qcom_cpufreq_kryo_get_msm_id(void)`
`48`	`48`	`{`
`49`	`49`	`size_t len;`
`50`	`50`	`u32 *msm_id;`
`@@ -222,7 +222,7 @@ static int __init qcom_cpufreq_kryo_init(void)`
`222`	`222`	`}`
`223`	`223`	`module_init(qcom_cpufreq_kryo_init);`
`224`	`224`
`225`		`-static void __init qcom_cpufreq_kryo_exit(void)`
	`225`	`+static void __exit qcom_cpufreq_kryo_exit(void)`
`226`	`226`	`{`
`227`	`227`	`platform_device_unregister(kryo_cpufreq_pdev);`
`228`	`228`	`platform_driver_unregister(&qcom_cpufreq_kryo_driver);`