Merge branches 'pm-cpuidle', 'pm-opp' and 'pm-avs'

* pm-cpuidle:
  ARM: cpuidle: Fix error return code

* pm-opp:
  PM / OPP: Don't support OPP if it provides supported-hw but platform does not
  PM / OPP: avoid maybe-uninitialized warning

* pm-avs:
  PM / AVS: SmartReflex: Neaten logging

diff --combined drivers/cpuidle/cpuidle-arm.c
index 4ba3d3f,1855b9e,4ba3d3f,4ba3d3f..f440d38
--- 1/drivers/cpuidle/cpuidle-arm.c
--- 2/drivers/cpuidle/cpuidle-arm.c
--- 3/drivers/cpuidle/cpuidle-arm.c
--- 4/drivers/cpuidle/cpuidle-arm.c
+++ b/drivers/cpuidle/cpuidle-arm.c
@@@@@ -36,12 -36,26 -36,12 -36,12 +36,12 @@@@@
    static int arm_enter_idle_state(struct cpuidle_device *dev,
                                struct cpuidle_driver *drv, int idx)
    {
 -      int ret;
 -  
 -      if (!idx) {
 -              cpu_do_idle();
 -              return idx;
 -      }
 -  
 -      ret = cpu_pm_enter();
 -      if (!ret) {
 -              /*
 -               * Pass idle state index to cpu_suspend which in turn will
 -               * call the CPU ops suspend protocol with idle index as a
 -               * parameter.
 -               */
 -              ret = arm_cpuidle_suspend(idx);
 -  
 -              cpu_pm_exit();
 -      }
 -  
 -      return ret ? -1 : idx;
 +      /*
 +       * Pass idle state index to arm_cpuidle_suspend which in turn
 +       * will call the CPU ops suspend protocol with idle index as a
 +       * parameter.
 +       */
 +      return CPU_PM_CPU_IDLE_ENTER(arm_cpuidle_suspend, idx);
    }
    
    static struct cpuidle_driver arm_idle_driver = {
@@@@@ -121,6 -135,7 -121,6 -121,6 +121,7 @@@@@ static int __init arm_idle_init(void
                dev = kzalloc(sizeof(*dev), GFP_KERNEL);
                if (!dev) {
                        pr_err("Failed to allocate cpuidle device\n");
+ ++                    ret = -ENOMEM;
                        goto out_fail;
                }
                dev->cpu = cpu;