OMAP24xx chips don't support software-configurable sleep dependencies.
Test early for this so the compiler can redact the entire function body
on OMAP24xx.

Signed-off-by: Paul Walmsley <p...@pwsan.com>
---
 arch/arm/mach-omap2/powerdomain.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm/mach-omap2/powerdomain.c 
b/arch/arm/mach-omap2/powerdomain.c
index 9708f12..4147267 100644
--- a/arch/arm/mach-omap2/powerdomain.c
+++ b/arch/arm/mach-omap2/powerdomain.c
@@ -571,10 +571,10 @@ int pwrdm_add_sleepdep(struct powerdomain *pwrdm1, struct 
powerdomain *pwrdm2)
 {
        struct powerdomain *p;
 
-       if (!pwrdm1)
+       if (!cpu_is_omap34xx())
                return -EINVAL;
 
-       if (!cpu_is_omap34xx())
+       if (!pwrdm1)
                return -EINVAL;
 
        p = _pwrdm_deps_lookup(pwrdm2, pwrdm1->sleepdep_srcs);
@@ -610,10 +610,10 @@ int pwrdm_del_sleepdep(struct powerdomain *pwrdm1, struct 
powerdomain *pwrdm2)
 {
        struct powerdomain *p;
 
-       if (!pwrdm1)
+       if (!cpu_is_omap34xx())
                return -EINVAL;
 
-       if (!cpu_is_omap34xx())
+       if (!pwrdm1)
                return -EINVAL;
 
        p = _pwrdm_deps_lookup(pwrdm2, pwrdm1->sleepdep_srcs);
@@ -653,10 +653,10 @@ int pwrdm_read_sleepdep(struct powerdomain *pwrdm1, 
struct powerdomain *pwrdm2)
 {
        struct powerdomain *p;
 
-       if (!pwrdm1)
+       if (!cpu_is_omap34xx())
                return -EINVAL;
 
-       if (!cpu_is_omap34xx())
+       if (!pwrdm1)
                return -EINVAL;
 
        p = _pwrdm_deps_lookup(pwrdm2, pwrdm1->sleepdep_srcs);


--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to