ARM / shmobile: Return -EBUSY from A4LC power off if A3RV is active

Since the A4LC should only be powered off if the A3RV is off, make
the A4LC's power down routine return -EBUSY if A3RV is not off to
indicate to the core that it doesn't want to power off the domain in
that case.  This will cause the core to regard A4LC as active, so
the pm_genpd_poweron() in pd_power_down_a3rv() is not necessary any
more.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Magnus Damm <damm@opensource.se>

diff --git a/arch/arm/mach-shmobile/pm-sh7372.c b/arch/arm/mach-shmobile/pm-sh7372.c
index 0b07138908b7d76207a0c66549bc1eedf6825bc6..933fb411be0f2233b05c5f57009b0b4a0b99b670 100644 (file)
--- a/arch/arm/mach-shmobile/pm-sh7372.c
+++ b/arch/arm/mach-shmobile/pm-sh7372.c
@@ -106,7 +106,6 @@ static int pd_power_down_a3rv(struct generic_pm_domain *genpd)
        int ret = pd_power_down(genpd);
 
        /* try to power down A4LC after A3RV is requested off */
-       pm_genpd_poweron(&sh7372_a4lc.genpd);
        genpd_queue_power_off_work(&sh7372_a4lc.genpd);
 
        return ret;
@@ -118,7 +117,7 @@ static int pd_power_down_a4lc(struct generic_pm_domain *genpd)
        if (!(__raw_readl(PSTR) & (1 << sh7372_a3rv.bit_shift)))
                return pd_power_down(genpd);
 
-       return 0;
+       return -EBUSY;
 }
 
 static bool pd_active_wakeup(struct device *dev)