Merge branches 'pm-cpufreq' and 'pm-devfreq'

rafaeljw · rafaeljw · commit 88ea0f2c02f4 · 2014-01-29T11:48:23.000+01:00
* pm-cpufreq:
  acpi-cpufreq: De-register CPU notifier and free struct msr on error.

* pm-devfreq:
  PM / devfreq: Disable Exynos4 driver build on multiplatform
diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c
@@ -919,7 +919,7 @@ static void __init acpi_cpufreq_boost_init(void)
 	}
 }
 
-static void __exit acpi_cpufreq_boost_exit(void)
+static void acpi_cpufreq_boost_exit(void)
 {
 	if (msrs) {
 		unregister_cpu_notifier(&boost_nb);
@@ -969,9 +969,10 @@ static int __init acpi_cpufreq_init(void)
 	acpi_cpufreq_boost_init();
 
 	ret = cpufreq_register_driver(&acpi_cpufreq_driver);
-	if (ret)
+	if (ret) {
 		free_acpi_perf_data();
-
+		acpi_cpufreq_boost_exit();
+	}
 	return ret;
 }
 
diff --git a/drivers/devfreq/Kconfig b/drivers/devfreq/Kconfig
@@ -67,7 +67,7 @@ comment "DEVFREQ Drivers"
 
 config ARM_EXYNOS4_BUS_DEVFREQ
 	bool "ARM Exynos4210/4212/4412 Memory Bus DEVFREQ Driver"
-	depends on CPU_EXYNOS4210 || SOC_EXYNOS4212 || SOC_EXYNOS4412
+	depends on (CPU_EXYNOS4210 || SOC_EXYNOS4212 || SOC_EXYNOS4412) && !ARCH_MULTIPLATFORM
 	select ARCH_HAS_OPP
 	select DEVFREQ_GOV_SIMPLE_ONDEMAND
 	help

Original file line number	Diff line number	Diff line change
`@@ -919,7 +919,7 @@ static void __init acpi_cpufreq_boost_init(void)`
`919`	`919`	`}`
`920`	`920`	`}`
`921`	`921`
`922`		`-static void __exit acpi_cpufreq_boost_exit(void)`
	`922`	`+static void acpi_cpufreq_boost_exit(void)`
`923`	`923`	`{`
`924`	`924`	`if (msrs) {`
`925`	`925`	`unregister_cpu_notifier(&boost_nb);`
`@@ -969,9 +969,10 @@ static int __init acpi_cpufreq_init(void)`
`969`	`969`	`acpi_cpufreq_boost_init();`
`970`	`970`
`971`	`971`	`ret = cpufreq_register_driver(&acpi_cpufreq_driver);`
`972`		`- if (ret)`
	`972`	`+ if (ret) {`
`973`	`973`	`free_acpi_perf_data();`
`974`		`-`
	`974`	`+ acpi_cpufreq_boost_exit();`
	`975`	`+ }`
`975`	`976`	`return ret;`
`976`	`977`	`}`
`977`	`978`