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

diff --combined kernel/cpu.c
index 217fd2e7f4354140146c910f8de0607458462557,1fca8b716ec1059cf4a8df5c6f420a43c6a79003..5339aca811d2289690198119206eaa42d959452f
--- 1/kernel/cpu.c
--- 2/kernel/cpu.c
+++ b/kernel/cpu.c
@@@ -659,6 -659,7 +659,6 @@@ void __init cpuhp_threads_init(void
        kthread_unpark(this_cpu_read(cpuhp_state.thread));
  }
  
 -#ifdef CONFIG_HOTPLUG_CPU
  EXPORT_SYMBOL(register_cpu_notifier);
  EXPORT_SYMBOL(__register_cpu_notifier);
  void unregister_cpu_notifier(struct notifier_block *nb)
@@@ -675,7 -676,6 +675,7 @@@ void __unregister_cpu_notifier(struct n
  }
  EXPORT_SYMBOL(__unregister_cpu_notifier);
  
 +#ifdef CONFIG_HOTPLUG_CPU
  /**
   * clear_tasks_mm_cpumask - Safely clear tasks' mm_cpumask for a CPU
   * @cpu: a CPU id
@@@ -1586,7 -1586,11 +1586,11 @@@ EXPORT_SYMBOL_GPL(__cpuhp_state_add_ins
   * @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,