Check for the presence of some of the arch_pwrdm function pointers
during powerdomain setup, rather than in the individual functions.
The primary motivation is to make the code slightly easier to read, but it
also should avoid a few instructions in some hot paths.
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
---
arch/arm/mach-omap2/powerdomain.c | 43 +++++++++++++++----------------------
1 file changed, 18 insertions(+), 25 deletions(-)
diff --git a/arch/arm/mach-omap2/powerdomain.c b/arch/arm/mach-omap2/powerdomain.c
index f81aee1..b67d721 100644
--- a/arch/arm/mach-omap2/powerdomain.c
+++ b/arch/arm/mach-omap2/powerdomain.c
@@ -385,9 +385,6 @@ static int _set_logic_retst_and_pwrdm_pwrst(struct powerdomain *pwrdm,
if (!_pwrdm_pwrst_is_controllable(pwrdm))
return 0;
- if (!arch_pwrdm || !arch_pwrdm->pwrdm_set_next_pwrst)
- return -EINVAL;
-
if (!(pwrdm->pwrsts & (1 << pwrst)))
return -EINVAL;
@@ -395,13 +392,11 @@ static int _set_logic_retst_and_pwrdm_pwrst(struct powerdomain *pwrdm,
if (!(pwrdm->pwrsts_logic_ret & (1 << logic)))
return -EINVAL;
- if (arch_pwrdm->pwrdm_set_logic_retst) {
- ret = arch_pwrdm->pwrdm_set_logic_retst(pwrdm, logic);
- if (ret) {
- pr_err("%s: unable to set logic state %0x of powerdomain: %s\n",
- __func__, logic, pwrdm->name);
- return ret;
- }
+ ret = arch_pwrdm->pwrdm_set_logic_retst(pwrdm, logic);
+ if (ret) {
+ pr_err("%s: unable to set logic state %0x of powerdomain: %s\n",
+ __func__, logic, pwrdm->name);
+ return ret;
}
}
@@ -426,9 +421,6 @@ static int _pwrdm_read_next_fpwrst(struct powerdomain *pwrdm)
int next_pwrst, next_logic, ret;
u8 fpwrst;
- if (!arch_pwrdm || !arch_pwrdm->pwrdm_read_next_pwrst)
- return -EINVAL;
-
next_pwrst = arch_pwrdm->pwrdm_read_next_pwrst(pwrdm);
if (next_pwrst < 0)
return next_pwrst;
@@ -653,9 +645,12 @@ static int _pwrdm_post_transition_cb(struct powerdomain *pwrdm, void *unused)
*
* Register the list of function pointers used to implement the
* powerdomain functions on different OMAP SoCs. Should be called
- * before any other pwrdm_register*() function. Returns -EINVAL if
- * @po is null, -EEXIST if platform functions have already been
- * registered, or 0 upon success.
+ * before any other pwrdm_register*() function. Several function
+ * pointers in @po are required to be non-null for the powerdomain
+ * code to function: pwrdm_wait_transition, pwrdm_read_next_pwrst,
+ * pwrdm_read_pwrst, pwrdm_set_next_pwrst, pwrdm_set_logic_retst, and
+ * pwrdm_read_prev_pwrst. Returns -EINVAL if @po is null, -EEXIST if
+ * platform functions have already been registered, or 0 upon success.
*/
int pwrdm_register_platform_funcs(struct pwrdm_ops *po)
{
@@ -665,6 +660,11 @@ int pwrdm_register_platform_funcs(struct pwrdm_ops *po)
if (arch_pwrdm)
return -EEXIST;
+ if (!po->pwrdm_wait_transition || !po->pwrdm_read_next_pwrst ||
+ !po->pwrdm_read_pwrst || !po->pwrdm_set_next_pwrst ||
+ !po->pwrdm_set_logic_retst || !po->pwrdm_read_prev_pwrst)
+ return -ENOENT;
+
arch_pwrdm = po;
return 0;
@@ -1221,7 +1221,7 @@ int pwrdm_read_next_fpwrst(struct powerdomain *pwrdm)
int next_pwrst, next_logic, ret;
u8 fpwrst;
- if (!arch_pwrdm || !arch_pwrdm->pwrdm_read_next_pwrst)
+ if (!arch_pwrdm)
return -EINVAL;
pwrdm_lock(pwrdm);
@@ -1264,8 +1264,7 @@ int pwrdm_set_fpwrst(struct powerdomain *pwrdm, enum pwrdm_func_state fpwrst)
int ret = 0;
bool hwsup = false;
- if (!pwrdm || IS_ERR(pwrdm) || !arch_pwrdm ||
- !arch_pwrdm->pwrdm_read_pwrst)
+ if (!pwrdm || IS_ERR(pwrdm) || !arch_pwrdm)
return -EINVAL;
/*
@@ -1334,9 +1333,6 @@ int pwrdm_read_fpwrst(struct powerdomain *pwrdm)
if (!_pwrdm_pwrst_can_change(pwrdm))
return PWRDM_FUNC_PWRST_ON;
- if (!arch_pwrdm->pwrdm_read_pwrst)
- return -EINVAL;
-
pwrdm_lock(pwrdm);
ret = _pwrdm_read_fpwrst(pwrdm);
pwrdm_unlock(pwrdm);
@@ -1362,9 +1358,6 @@ int pwrdm_read_prev_fpwrst(struct powerdomain *pwrdm)
if (!_pwrdm_pwrst_can_change(pwrdm))
return PWRDM_FUNC_PWRST_ON;
- if (!arch_pwrdm->pwrdm_read_prev_pwrst)
- return -EINVAL;
-
pwrdm_lock(pwrdm);
ret = _pwrdm_read_prev_fpwrst(pwrdm);
pwrdm_unlock(pwrdm);
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
