Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 85ba70b6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pm-fixes-4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull power management fixes from Rafael Wysocki:
 "They fix one bug introduced recently, a build warning and a kerneldoc
  function description.

  Specifics:

   - Prevent the acpi-cpufreq driver from crashing on exit by fixing a
     check against the __cpuhp_setup_state() return value and fix the
     kerneldoc description of that function to make it clear that it may
     return positive numbers on success too (Boris Ostrovsky)

   - Drop an incorrect __init annotation of a function in the s3c64xx
     cpufreq driver and fix a build warning generated (by older
     compilers) because of it (Arnd Bergmann)"

* tag 'pm-fixes-4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  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
parents 8d86cf88 7b99f1ae

drivers/cpufreq/acpi-cpufreq.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

}

drivers/cpufreq/s3c64xx-cpufreq.c

+1 −1
Original line number Diff line number Diff line
@@ -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;