|
@@ -478,7 +478,7 @@ int pwrdm_add_wkdep(struct powerdomain *pwrdm1, struct powerdomain *pwrdm2)
|
|
|
if (IS_ERR(p)) {
|
|
|
pr_debug("powerdomain: hardware cannot set/clear wake up of "
|
|
|
"%s when %s wakes up\n", pwrdm1->name, pwrdm2->name);
|
|
|
- return IS_ERR(p);
|
|
|
+ return PTR_ERR(p);
|
|
|
}
|
|
|
|
|
|
pr_debug("powerdomain: hardware will wake up %s when %s wakes up\n",
|
|
@@ -511,7 +511,7 @@ int pwrdm_del_wkdep(struct powerdomain *pwrdm1, struct powerdomain *pwrdm2)
|
|
|
if (IS_ERR(p)) {
|
|
|
pr_debug("powerdomain: hardware cannot set/clear wake up of "
|
|
|
"%s when %s wakes up\n", pwrdm1->name, pwrdm2->name);
|
|
|
- return IS_ERR(p);
|
|
|
+ return PTR_ERR(p);
|
|
|
}
|
|
|
|
|
|
pr_debug("powerdomain: hardware will no longer wake up %s after %s "
|
|
@@ -548,7 +548,7 @@ int pwrdm_read_wkdep(struct powerdomain *pwrdm1, struct powerdomain *pwrdm2)
|
|
|
if (IS_ERR(p)) {
|
|
|
pr_debug("powerdomain: hardware cannot set/clear wake up of "
|
|
|
"%s when %s wakes up\n", pwrdm1->name, pwrdm2->name);
|
|
|
- return IS_ERR(p);
|
|
|
+ return PTR_ERR(p);
|
|
|
}
|
|
|
|
|
|
return prm_read_mod_bits_shift(pwrdm1->prcm_offs, PM_WKDEP,
|
|
@@ -582,7 +582,7 @@ int pwrdm_add_sleepdep(struct powerdomain *pwrdm1, struct powerdomain *pwrdm2)
|
|
|
pr_debug("powerdomain: hardware cannot set/clear sleep "
|
|
|
"dependency affecting %s from %s\n", pwrdm1->name,
|
|
|
pwrdm2->name);
|
|
|
- return IS_ERR(p);
|
|
|
+ return PTR_ERR(p);
|
|
|
}
|
|
|
|
|
|
pr_debug("powerdomain: will prevent %s from sleeping if %s is active\n",
|
|
@@ -621,7 +621,7 @@ int pwrdm_del_sleepdep(struct powerdomain *pwrdm1, struct powerdomain *pwrdm2)
|
|
|
pr_debug("powerdomain: hardware cannot set/clear sleep "
|
|
|
"dependency affecting %s from %s\n", pwrdm1->name,
|
|
|
pwrdm2->name);
|
|
|
- return IS_ERR(p);
|
|
|
+ return PTR_ERR(p);
|
|
|
}
|
|
|
|
|
|
pr_debug("powerdomain: will no longer prevent %s from sleeping if "
|
|
@@ -664,7 +664,7 @@ int pwrdm_read_sleepdep(struct powerdomain *pwrdm1, struct powerdomain *pwrdm2)
|
|
|
pr_debug("powerdomain: hardware cannot set/clear sleep "
|
|
|
"dependency affecting %s from %s\n", pwrdm1->name,
|
|
|
pwrdm2->name);
|
|
|
- return IS_ERR(p);
|
|
|
+ return PTR_ERR(p);
|
|
|
}
|
|
|
|
|
|
return prm_read_mod_bits_shift(pwrdm1->prcm_offs, OMAP3430_CM_SLEEPDEP,
|