diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-12-22 14:34:55 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-12-22 14:34:55 +0100 |
| commit | 7b99f1aeed37196ad54099c30c2f154a7d6e91e0 (patch) | |
| tree | 6c19dc46f3157e9988ab9bb65acade116801babc /drivers | |
| parent | 7ae123edd37a47e178eb9a6631fe4a7108262c10 (diff) | |
| parent | adec57c61c2421d9d06c1fa8dd1ff7ed4fd2ca1b (diff) | |
| download | linux-7b99f1aeed37196ad54099c30c2f154a7d6e91e0.tar.gz linux-7b99f1aeed37196ad54099c30c2f154a7d6e91e0.tar.bz2 linux-7b99f1aeed37196ad54099c30c2f154a7d6e91e0.zip | |
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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/cpufreq/acpi-cpufreq.c | 2 | ||||
| -rw-r--r-- | drivers/cpufreq/s3c64xx-cpufreq.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c index 3a98702b7445..3a2ca0f79daf 100644 --- a/drivers/cpufreq/acpi-cpufreq.c +++ b/drivers/cpufreq/acpi-cpufreq.c @@ -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); } diff --git a/drivers/cpufreq/s3c64xx-cpufreq.c b/drivers/cpufreq/s3c64xx-cpufreq.c index 176e84cc3991..0cb9040eca49 100644 --- a/drivers/cpufreq/s3c64xx-cpufreq.c +++ b/drivers/cpufreq/s3c64xx-cpufreq.c @@ -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; |