Commit 7b99f1ae authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

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
parents 7ae123ed adec57c6

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;

kernel/cpu.c

+5 −1
Original line number Diff line number Diff line
@@ -1586,7 +1586,11 @@ EXPORT_SYMBOL_GPL(__cpuhp_state_add_instance); 
 * @startup:	startup callback function

 * @teardown:	teardown callback function

 *

 * Returns 0 if successful, otherwise a proper error code

 * Returns:

 *   On success:

 *      Positive state number if @state is CPUHP_AP_ONLINE_DYN

 *      0 for all other states

 *   On failure: proper (negative) error code

 */

int __cpuhp_setup_state(enum cpuhp_state state,

			const char *name, bool invoke,