mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
Merge branch 'pm-cpufreq'
* pm-cpufreq: cpufreq: s3c64xx: remove incorrect __init annotation cpufreq: Remove CPU hotplug callbacks only if they were initialized CPU/hotplug: Clarify description of __cpuhp_setup_state() return value
This commit is contained in:
commit
7b99f1aeed
3 changed files with 7 additions and 3 deletions
|
|
@ -930,7 +930,7 @@ static void __init acpi_cpufreq_boost_init(void)
|
|||
|
||||
static void acpi_cpufreq_boost_exit(void)
|
||||
{
|
||||
if (acpi_cpufreq_online >= 0)
|
||||
if (acpi_cpufreq_online > 0)
|
||||
cpuhp_remove_state_nocalls(acpi_cpufreq_online);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -107,7 +107,7 @@ static int s3c64xx_cpufreq_set_target(struct cpufreq_policy *policy,
|
|||
}
|
||||
|
||||
#ifdef CONFIG_REGULATOR
|
||||
static void __init s3c64xx_cpufreq_config_regulator(void)
|
||||
static void s3c64xx_cpufreq_config_regulator(void)
|
||||
{
|
||||
int count, v, i, found;
|
||||
struct cpufreq_frequency_table *freq;
|
||||
|
|
|
|||
Loading…
Reference in a new issue