1 files changed, 8 insertions, 52 deletions

diff --git a/include/power-domain.h b/include/power-domain.h
index ad33dea76ce..18525073e5e 100644
--- a/include/power-domain.h
+++ b/include/power-domain.h
@@ -147,82 +147,38 @@ static inline int power_domain_free(struct power_domain *power_domain)
 #endif
 
 /**
- * power_domain_on_lowlevel - Enable power to a power domain (with refcounting)
+ * power_domain_on - Enable power to a power domain.
  *
  * @power_domain:	A power domain struct that was previously successfully
  *		requested by power_domain_get().
- * Return: 0 if the transition has been performed correctly,
- *         -EALREADY if the domain is already on,
- *         a negative error code otherwise.
+ * Return: 0 if OK, or a negative error code.
  */
 #if CONFIG_IS_ENABLED(POWER_DOMAIN)
-int power_domain_on_lowlevel(struct power_domain *power_domain);
+int power_domain_on(struct power_domain *power_domain);
 #else
-static inline int power_domain_on_lowlevel(struct power_domain *power_domain)
+static inline int power_domain_on(struct power_domain *power_domain)
 {
 	return -ENOSYS;
 }
 #endif
 
 /**
- * power_domain_on - Enable power to a power domain (ignores the actual state
- *		      of the power domain)
- *
- * @power_domain:	A power domain struct that was previously successfully
- *		requested by power_domain_get().
- * Return: a negative error code upon error during the transition, 0 otherwise.
- */
-static inline int power_domain_on(struct power_domain *power_domain)
-{
-	int ret;
-
-	ret = power_domain_on_lowlevel(power_domain);
-	if (ret == -EALREADY)
-		ret = 0;
-
-	return ret;
-}
-
-/**
- * power_domain_off_lowlevel - Disable power to a power domain (with refcounting)
+ * power_domain_off - Disable power to a power domain.
  *
  * @power_domain:	A power domain struct that was previously successfully
  *		requested by power_domain_get().
- * Return: 0 if the transition has been performed correctly,
- *         -EALREADY if the domain is already off,
- *         -EBUSY if another device is keeping the domain on (but the refcounter
- *         is decremented),
- *         a negative error code otherwise.
+ * Return: 0 if OK, or a negative error code.
  */
 #if CONFIG_IS_ENABLED(POWER_DOMAIN)
-int power_domain_off_lowlevel(struct power_domain *power_domain);
+int power_domain_off(struct power_domain *power_domain);
 #else
-static inline int power_domain_off_lowlevel(struct power_domain *power_domain)
+static inline int power_domain_off(struct power_domain *power_domain)
 {
 	return -ENOSYS;
 }
 #endif
 
 /**
- * power_domain_off - Disable power to a power domain (ignores the actual state
- *		      of the power domain)
- *
- * @power_domain:	A power domain struct that was previously successfully
- *		requested by power_domain_get().
- * Return: a negative error code upon error during the transition, 0 otherwise.
- */
-static inline int power_domain_off(struct power_domain *power_domain)
-{
-	int ret;
-
-	ret = power_domain_off_lowlevel(power_domain);
-	if (ret == -EALREADY || ret == -EBUSY)
-		ret = 0;
-
-	return ret;
-}
-
-/**
  * dev_power_domain_on - Enable power domains for a device .
  *
  * @dev:		The client device.