[PATCH] phy: core: Fixup return value of phy_exit when !pm_runtime_enabled

[PATCH] phy: core: Fixup return value of phy_exit when !pm_runtime_enabled

[Axel Lin]

When phy_pm_runtime_get_sync() returns -ENOTSUPP, phy_exit() also returns
-ENOTSUPP if !phy->ops->exit. Fix it.
Also move the code to override ret close to the code we got ret.
I think it is less error prone this way.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
---
 drivers/phy/phy-core.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/phy/phy-core.c b/drivers/phy/phy-core.c
index a12d353..250dc6c 100644
--- a/drivers/phy/phy-core.c
+++ b/drivers/phy/phy-core.c
@@ -223,6 +223,7 @@ int phy_init(struct phy *phy)
 	ret = phy_pm_runtime_get_sync(phy);
 	if (ret < 0 && ret != -ENOTSUPP)
 		return ret;
+	ret = 0; /* Override possible ret == -ENOTSUPP */
 
 	mutex_lock(&phy->mutex);
 	if (phy->init_count == 0 && phy->ops->init) {
@@ -231,8 +232,6 @@ int phy_init(struct phy *phy)
 			dev_err(&phy->dev, "phy init failed --> %d\n", ret);
 			goto out;
 		}
-	} else {
-		ret = 0; /* Override possible ret == -ENOTSUPP */
 	}
 	++phy->init_count;
 
@@ -253,6 +252,7 @@ int phy_exit(struct phy *phy)
 	ret = phy_pm_runtime_get_sync(phy);
 	if (ret < 0 && ret != -ENOTSUPP)
 		return ret;
+	ret = 0; /* Override possible ret == -ENOTSUPP */
 
 	mutex_lock(&phy->mutex);
 	if (phy->init_count == 1 && phy->ops->exit) {
@@ -287,6 +287,7 @@ int phy_power_on(struct phy *phy)
 	ret = phy_pm_runtime_get_sync(phy);
 	if (ret < 0 && ret != -ENOTSUPP)
 		return ret;
+	ret = 0; /* Override possible ret == -ENOTSUPP */
 
 	mutex_lock(&phy->mutex);
 	if (phy->power_count == 0 && phy->ops->power_on) {
@@ -295,8 +296,6 @@ int phy_power_on(struct phy *phy)
 			dev_err(&phy->dev, "phy poweron failed --> %d\n", ret);
 			goto out;
 		}
-	} else {
-		ret = 0; /* Override possible ret == -ENOTSUPP */
 	}
 	++phy->power_count;
 	mutex_unlock(&phy->mutex);
-- 
1.9.1

Re: [PATCH] phy: core: Fixup return value of phy_exit when !pm_runtime_enabled

[Roger Quadros]

On 06/03/15 09:55, Axel Lin wrote:
> When phy_pm_runtime_get_sync() returns -ENOTSUPP, phy_exit() also returns
> -ENOTSUPP if !phy->ops->exit. Fix it.
> Also move the code to override ret close to the code we got ret.
> I think it is less error prone this way.
> 
> Signed-off-by: Axel Lin <axel.lin@ingics.com>

Acked-by: Roger Quadros <rogerq@ti.com>

cheers,
-roger

> ---
>  drivers/phy/phy-core.c | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/phy/phy-core.c b/drivers/phy/phy-core.c
> index a12d353..250dc6c 100644
> --- a/drivers/phy/phy-core.c
> +++ b/drivers/phy/phy-core.c
> @@ -223,6 +223,7 @@ int phy_init(struct phy *phy)
>  	ret = phy_pm_runtime_get_sync(phy);
>  	if (ret < 0 && ret != -ENOTSUPP)
>  		return ret;
> +	ret = 0; /* Override possible ret == -ENOTSUPP */
>  
>  	mutex_lock(&phy->mutex);
>  	if (phy->init_count == 0 && phy->ops->init) {
> @@ -231,8 +232,6 @@ int phy_init(struct phy *phy)
>  			dev_err(&phy->dev, "phy init failed --> %d\n", ret);
>  			goto out;
>  		}
> -	} else {
> -		ret = 0; /* Override possible ret == -ENOTSUPP */
>  	}
>  	++phy->init_count;
>  
> @@ -253,6 +252,7 @@ int phy_exit(struct phy *phy)
>  	ret = phy_pm_runtime_get_sync(phy);
>  	if (ret < 0 && ret != -ENOTSUPP)
>  		return ret;
> +	ret = 0; /* Override possible ret == -ENOTSUPP */
>  
>  	mutex_lock(&phy->mutex);
>  	if (phy->init_count == 1 && phy->ops->exit) {
> @@ -287,6 +287,7 @@ int phy_power_on(struct phy *phy)
>  	ret = phy_pm_runtime_get_sync(phy);
>  	if (ret < 0 && ret != -ENOTSUPP)
>  		return ret;
> +	ret = 0; /* Override possible ret == -ENOTSUPP */
>  
>  	mutex_lock(&phy->mutex);
>  	if (phy->power_count == 0 && phy->ops->power_on) {
> @@ -295,8 +296,6 @@ int phy_power_on(struct phy *phy)
>  			dev_err(&phy->dev, "phy poweron failed --> %d\n", ret);
>  			goto out;
>  		}
> -	} else {
> -		ret = 0; /* Override possible ret == -ENOTSUPP */
>  	}
>  	++phy->power_count;
>  	mutex_unlock(&phy->mutex);
>