Merge tag 'ovl-update-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs

[linux-2.6-microblaze.git] / drivers / cpuidle / cpuidle-tegra.c

diff --git a/drivers/cpuidle/cpuidle-tegra.c b/drivers/cpuidle/cpuidle-tegra.c
index a12fb14..e895670 100644 (file)
--- a/drivers/cpuidle/cpuidle-tegra.c
+++ b/drivers/cpuidle/cpuidle-tegra.c
@@ -172,7 +172,7 @@ static int tegra_cpuidle_coupled_barrier(struct cpuidle_device *dev)
 static int tegra_cpuidle_state_enter(struct cpuidle_device *dev,
                                     int index, unsigned int cpu)
 {
-       int ret;
+       int err;
 
        /*
         * CC6 state is the "CPU cluster power-off" state.  In order to
@@ -183,9 +183,9 @@ static int tegra_cpuidle_state_enter(struct cpuidle_device *dev,
         * CPU cores, GIC and L2 cache).
         */
        if (index == TEGRA_CC6) {
-               ret = tegra_cpuidle_coupled_barrier(dev);
-               if (ret)
-                       return ret;
+               err = tegra_cpuidle_coupled_barrier(dev);
+               if (err)
+                       return err;
        }
 
        local_fiq_disable();
@@ -194,15 +194,15 @@ static int tegra_cpuidle_state_enter(struct cpuidle_device *dev,
 
        switch (index) {
        case TEGRA_C7:
-               ret = tegra_cpuidle_c7_enter();
+               err = tegra_cpuidle_c7_enter();
                break;
 
        case TEGRA_CC6:
-               ret = tegra_cpuidle_cc6_enter(cpu);
+               err = tegra_cpuidle_cc6_enter(cpu);
                break;
 
        default:
-               ret = -EINVAL;
+               err = -EINVAL;
                break;
        }
 
@@ -210,7 +210,7 @@ static int tegra_cpuidle_state_enter(struct cpuidle_device *dev,
        tegra_pm_clear_cpu_in_lp2();
        local_fiq_enable();
 
-       return ret;
+       return err ?: index;
 }
 
 static int tegra_cpuidle_adjust_state_index(int index, unsigned int cpu)
@@ -236,21 +236,27 @@ static int tegra_cpuidle_enter(struct cpuidle_device *dev,
                               int index)
 {
        unsigned int cpu = cpu_logical_map(dev->cpu);
-       int err;
+       int ret;
 
        index = tegra_cpuidle_adjust_state_index(index, cpu);
        if (dev->states_usage[index].disable)
                return -1;
 
        if (index == TEGRA_C1)
-               err = arm_cpuidle_simple_enter(dev, drv, index);
+               ret = arm_cpuidle_simple_enter(dev, drv, index);
        else
-               err = tegra_cpuidle_state_enter(dev, index, cpu);
+               ret = tegra_cpuidle_state_enter(dev, index, cpu);
 
-       if (err && (err != -EINTR || index != TEGRA_CC6))
-               pr_err_once("failed to enter state %d err: %d\n", index, err);
+       if (ret < 0) {
+               if (ret != -EINTR || index != TEGRA_CC6)
+                       pr_err_once("failed to enter state %d err: %d\n",
+                                   index, ret);
+               index = -1;
+       } else {
+               index = ret;
+       }
 
-       return err ? -1 : index;
+       return index;
 }
 
 static int tegra114_enter_s2idle(struct cpuidle_device *dev,