Merge branch 'next/cleanup' into for-next

* next/cleanup:
  ARM: Remove __ref on hotplug cpu die path
  ARM: Remove open-coded version of IRQCHIP_DECLARE
  ARM: shmobile: R-Mobile: add missing of_node_put
  ARM: shmobile: dt: Rename incorrect interrupt related binding
  ARM: shmobile: apmu: correct type of CPU id
  ARM: shmobile: r8a7779: Remove legacy PM Domain remainings
  ARM: shmobile: r8a7778: Make r8a7778_init_irq_dt() static
  ARM: shmobile: smp: Make shmobile_smp_apmu_cpu_shutdown() static

diff --combined arch/arm/mach-shmobile/pm-rmobile.c
index 89068c8ec50f2c76342cbf77a6e5d8d74643935f,424155b0cfe98965e984d82a22e563294c95e483..46d0a1ddce755e80ffc3f8f1bc6a510287da7906
--- 1/arch/arm/mach-shmobile/pm-rmobile.c
--- 2/arch/arm/mach-shmobile/pm-rmobile.c
+++ b/arch/arm/mach-shmobile/pm-rmobile.c
@@@ -12,7 -12,6 +12,7 @@@
   * License.  See the file "COPYING" in the main directory of this archive
   * for more details.
   */
 +#include <linux/clk/shmobile.h>
  #include <linux/console.h>
  #include <linux/delay.h>
  #include <linux/of.h>
@@@ -125,6 -124,36 +125,6 @@@ static bool rmobile_pd_active_wakeup(st
        return true;
  }
  
 -static int rmobile_pd_attach_dev(struct generic_pm_domain *domain,
 -                               struct device *dev)
 -{
 -      int error;
 -
 -      error = pm_clk_create(dev);
 -      if (error) {
 -              dev_err(dev, "pm_clk_create failed %d\n", error);
 -              return error;
 -      }
 -
 -      error = pm_clk_add(dev, NULL);
 -      if (error) {
 -              dev_err(dev, "pm_clk_add failed %d\n", error);
 -              goto fail;
 -      }
 -
 -      return 0;
 -
 -fail:
 -      pm_clk_destroy(dev);
 -      return error;
 -}
 -
 -static void rmobile_pd_detach_dev(struct generic_pm_domain *domain,
 -                                struct device *dev)
 -{
 -      pm_clk_destroy(dev);
 -}
 -
  static void rmobile_init_pm_domain(struct rmobile_pm_domain *rmobile_pd)
  {
        struct generic_pm_domain *genpd = &rmobile_pd->genpd;
@@@ -135,8 -164,8 +135,8 @@@
        genpd->dev_ops.active_wakeup    = rmobile_pd_active_wakeup;
        genpd->power_off                = rmobile_pd_power_down;
        genpd->power_on                 = rmobile_pd_power_up;
 -      genpd->attach_dev               = rmobile_pd_attach_dev;
 -      genpd->detach_dev               = rmobile_pd_detach_dev;
 +      genpd->attach_dev               = cpg_mstp_attach_dev;
 +      genpd->detach_dev               = cpg_mstp_detach_dev;
        __rmobile_pd_power_up(rmobile_pd, false);
  }
  
@@@ -313,8 -342,10 +313,10 @@@ static int __init rmobile_add_pm_domain
                }
  
                pd = kzalloc(sizeof(*pd), GFP_KERNEL);
-               if (!pd)
+               if (!pd) {
+                       of_node_put(np);
                        return -ENOMEM;
+               }
  
                pd->genpd.name = np->name;
                pd->base = base;