Merge tag 'driver-core-4.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull driver core updates from Greg KH:
 "Here is the new patches for the driver core / sysfs for 4.3-rc1.

  Very small number of changes here, all the details are in the
  shortlog, nothing major happening at all this kernel release, which is
  nice to see"

* tag 'driver-core-4.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
  bus: subsys: update return type of ->remove_dev() to void
  driver core: correct device's shutdown order
  driver core: fix docbook for device_private.device
  selftests: firmware: skip timeout checks for kernels without user mode helper
  kernel, cpu: Remove bogus __ref annotations
  cpu: Remove bogus __ref annotation of cpu_subsys_online()
  firmware: fix wrong memory deallocation in fw_add_devm_name()
  sysfs.txt: update show method notes about sprintf/snprintf/scnprintf usage
  devres: fix devres_get()

diff --cc drivers/cpufreq/cpufreq.c
index 7a3c30c4336f3cb9b7b67d5965b77175b4cad53f,6da25c10bdfd22187325175dcef162b7b16b0cf1..9bb09ce98d047813e094cd8e5993c0368febc62e
--- 1/drivers/cpufreq/cpufreq.c
--- 2/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@@ -1521,44 -1518,43 +1521,42 @@@ static int __cpufreq_remove_dev_finish(
   *
   * Removes the cpufreq interface for a CPU device.
   */
- static int cpufreq_remove_dev(struct device *dev, struct subsys_interface *sif)
+ static void cpufreq_remove_dev(struct device *dev, struct subsys_interface *sif)
  {
        unsigned int cpu = dev->id;
 -      int ret;
 -
 -      /*
 -       * Only possible if 'cpu' is getting physically removed now. A hotplug
 -       * notifier should have already been called and we just need to remove
 -       * link or free policy here.
 -       */
 -      if (cpu_is_offline(cpu)) {
 -              struct cpufreq_policy *policy = per_cpu(cpufreq_cpu_data, cpu);
 -              struct cpumask mask;
 +      struct cpufreq_policy *policy = per_cpu(cpufreq_cpu_data, cpu);
  
 -              if (!policy)
 -                      return;
 +      if (!policy)
-               return 0;
++              return;
  
 -              cpumask_copy(&mask, policy->related_cpus);
 -              cpumask_clear_cpu(cpu, &mask);
 +      if (cpu_online(cpu)) {
 +              __cpufreq_remove_dev_prepare(dev);
 +              __cpufreq_remove_dev_finish(dev);
 +      }
  
 -              /*
 -               * Free policy only if all policy->related_cpus are removed
 -               * physically.
 -               */
 -              if (cpumask_intersects(&mask, cpu_present_mask)) {
 -                      remove_cpu_dev_symlink(policy, cpu);
 -                      return;
 -              }
 +      cpumask_clear_cpu(cpu, policy->real_cpus);
  
 +      if (cpumask_empty(policy->real_cpus)) {
                cpufreq_policy_free(policy, true);
-               return 0;
+               return;
        }
  
 -      ret = __cpufreq_remove_dev_prepare(dev, sif);
 +      if (cpu != policy->kobj_cpu) {
 +              remove_cpu_dev_symlink(policy, cpu);
 +      } else {
 +              /*
 +               * The CPU owning the policy object is going away.  Move it to
 +               * another suitable CPU.
 +               */
 +              unsigned int new_cpu = cpumask_first(policy->real_cpus);
 +              struct device *new_dev = get_cpu_device(new_cpu);
  
 -      if (!ret)
 -              __cpufreq_remove_dev_finish(dev, sif);
 +              dev_dbg(dev, "%s: Moving policy object to CPU%u\n", __func__, new_cpu);
 +
 +              sysfs_remove_link(&new_dev->kobj, "cpufreq");
 +              policy->kobj_cpu = new_cpu;
 +              WARN_ON(kobject_move(&policy->kobj, &new_dev->kobj));
 +      }
- 
-       return 0;
  }
  
  static void handle_update(struct work_struct *work)

diff --cc kernel/cpu.c
Simple merge