diff mbox series

[3/3] regulator: rk8xx: clarify operator precedence

Message ID 20240605-pmic-rk8xx-v1-3-2349fdf68aa0@cherry.de
State Accepted
Commit 62d0c3085e4836b6f3edf1d41201b0568960df26
Delegated to: Kever Yang
Headers show
Series rockchip: rk8xx: fix broken [np]ldo callbacks | expand

Commit Message

Quentin Schulz June 5, 2024, 9:33 a.m. UTC 
From: Quentin Schulz <quentin.schulz@cherry.de>

My linter complains that the order isn't clear enough so let's put
parentheses around the ternary condition to make it happy.

Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
---
 drivers/power/regulator/rk8xx.c | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

Comments

Mattijs Korpershoek June 5, 2024, 11:20 a.m. UTC | #1 
Hi Quentin,

Thank you for the patch.

On mer., juin 05, 2024 at 11:33, Quentin Schulz <foss+uboot@0leil.net> wrote:

> From: Quentin Schulz <quentin.schulz@cherry.de>
>
> My linter complains that the order isn't clear enough so let's put
> parentheses around the ternary condition to make it happy.
>
> Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>

Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>

> ---
>  drivers/power/regulator/rk8xx.c | 26 +++++++++++++-------------
>  1 file changed, 13 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/power/regulator/rk8xx.c b/drivers/power/regulator/rk8xx.c
> index bd5a37e718f..3125835bc07 100644
> --- a/drivers/power/regulator/rk8xx.c
> +++ b/drivers/power/regulator/rk8xx.c
> @@ -520,7 +520,7 @@ static int _buck_get_enable(struct udevice *pmic, int buck)
>  	if (ret < 0)
>  		return ret;
>  
> -	return ret & mask ? true : false;
> +	return (ret & mask) ? true : false;
>  }
>  
>  static int _buck_set_suspend_enable(struct udevice *pmic, int buck, bool enable)
> @@ -585,7 +585,7 @@ static int _buck_get_suspend_enable(struct udevice *pmic, int buck)
>  		val = pmic_reg_read(pmic, RK816_REG_DCDC_SLP_EN);
>  		if (val < 0)
>  			return val;
> -		ret = val & mask ? 1 : 0;
> +		ret = (val & mask) ? 1 : 0;
>  		break;
>  	case RK806_ID:
>  		{
> @@ -608,7 +608,7 @@ static int _buck_get_suspend_enable(struct udevice *pmic, int buck)
>  		val = pmic_reg_read(pmic, REG_SLEEP_SET_OFF1);
>  		if (val < 0)
>  			return val;
> -		ret = val & mask ? 0 : 1;
> +		ret = (val & mask) ? 0 : 1;
>  		break;
>  	case RK809_ID:
>  	case RK817_ID:
> @@ -620,7 +620,7 @@ static int _buck_get_suspend_enable(struct udevice *pmic, int buck)
>  		val = pmic_reg_read(pmic, RK817_POWER_SLP_EN(0));
>  		if (val < 0)
>  			return val;
> -		ret = val & mask ? 1 : 0;
> +		ret = (val & mask) ? 1 : 0;
>  		break;
>  	default:
>  		ret = -EINVAL;
> @@ -723,7 +723,7 @@ static int _ldo_get_enable(struct udevice *pmic, int ldo)
>  	if (ret < 0)
>  		return ret;
>  
> -	return ret & mask ? true : false;
> +	return (ret & mask) ? true : false;
>  }
>  
>  static int _nldo_get_enable(struct udevice *pmic, int nldo)
> @@ -980,7 +980,7 @@ static int _ldo_get_suspend_enable(struct udevice *pmic, int ldo)
>  		val = pmic_reg_read(pmic, RK816_REG_LDO_SLP_EN);
>  		if (val < 0)
>  			return val;
> -		ret = val & mask ? 1 : 0;
> +		ret = (val & mask) ? 1 : 0;
>  		break;
>  	case RK808_ID:
>  	case RK818_ID:
> @@ -988,7 +988,7 @@ static int _ldo_get_suspend_enable(struct udevice *pmic, int ldo)
>  		val = pmic_reg_read(pmic, REG_SLEEP_SET_OFF2);
>  		if (val < 0)
>  			return val;
> -		ret = val & mask ? 0 : 1;
> +		ret = (val & mask) ? 0 : 1;
>  		break;
>  	case RK809_ID:
>  	case RK817_ID:
> @@ -997,13 +997,13 @@ static int _ldo_get_suspend_enable(struct udevice *pmic, int ldo)
>  			val = pmic_reg_read(pmic, RK817_POWER_SLP_EN(0));
>  			if (val < 0)
>  				return val;
> -			ret = val & mask ? 1 : 0;
> +			ret = (val & mask) ? 1 : 0;
>  		} else {
>  			mask = 1 << ldo;
>  			val = pmic_reg_read(pmic, RK817_POWER_SLP_EN(1));
>  			if (val < 0)
>  				return val;
> -			ret = val & mask ? 1 : 0;
> +			ret = (val & mask) ? 1 : 0;
>  		}
>  		break;
>  	}
> @@ -1438,7 +1438,7 @@ static int switch_get_enable(struct udevice *dev)
>  	if (ret < 0)
>  		return ret;
>  
> -	return ret & mask ? true : false;
> +	return (ret & mask) ? true : false;
>  }
>  
>  static int switch_set_suspend_value(struct udevice *dev, int uvolt)
> @@ -1493,21 +1493,21 @@ static int switch_get_suspend_enable(struct udevice *dev)
>  		val = pmic_reg_read(dev->parent, REG_SLEEP_SET_OFF1);
>  		if (val < 0)
>  			return val;
> -		ret = val & mask ? 0 : 1;
> +		ret = (val & mask) ? 0 : 1;
>  		break;
>  	case RK809_ID:
>  		mask = 1 << (sw + 6);
>  		val = pmic_reg_read(dev->parent, RK817_POWER_SLP_EN(0));
>  		if (val < 0)
>  			return val;
> -		ret = val & mask ? 1 : 0;
> +		ret = (val & mask) ? 1 : 0;
>  		break;
>  	case RK818_ID:
>  		mask = 1 << 6;
>  		val = pmic_reg_read(dev->parent, REG_SLEEP_SET_OFF1);
>  		if (val < 0)
>  			return val;
> -		ret = val & mask ? 0 : 1;
> +		ret = (val & mask) ? 0 : 1;
>  		break;
>  	}
>  
>
> -- 
> 2.45.1
Kever Yang June 6, 2024, 6:46 a.m. UTC | #2 
On 2024/6/5 17:33, Quentin Schulz wrote:
> From: Quentin Schulz <quentin.schulz@cherry.de>
>
> My linter complains that the order isn't clear enough so let's put
> parentheses around the ternary condition to make it happy.
>
> Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

Thanks,
- Kever
> ---
>   drivers/power/regulator/rk8xx.c | 26 +++++++++++++-------------
>   1 file changed, 13 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/power/regulator/rk8xx.c b/drivers/power/regulator/rk8xx.c
> index bd5a37e718f..3125835bc07 100644
> --- a/drivers/power/regulator/rk8xx.c
> +++ b/drivers/power/regulator/rk8xx.c
> @@ -520,7 +520,7 @@ static int _buck_get_enable(struct udevice *pmic, int buck)
>   	if (ret < 0)
>   		return ret;
>   
> -	return ret & mask ? true : false;
> +	return (ret & mask) ? true : false;
>   }
>   
>   static int _buck_set_suspend_enable(struct udevice *pmic, int buck, bool enable)
> @@ -585,7 +585,7 @@ static int _buck_get_suspend_enable(struct udevice *pmic, int buck)
>   		val = pmic_reg_read(pmic, RK816_REG_DCDC_SLP_EN);
>   		if (val < 0)
>   			return val;
> -		ret = val & mask ? 1 : 0;
> +		ret = (val & mask) ? 1 : 0;
>   		break;
>   	case RK806_ID:
>   		{
> @@ -608,7 +608,7 @@ static int _buck_get_suspend_enable(struct udevice *pmic, int buck)
>   		val = pmic_reg_read(pmic, REG_SLEEP_SET_OFF1);
>   		if (val < 0)
>   			return val;
> -		ret = val & mask ? 0 : 1;
> +		ret = (val & mask) ? 0 : 1;
>   		break;
>   	case RK809_ID:
>   	case RK817_ID:
> @@ -620,7 +620,7 @@ static int _buck_get_suspend_enable(struct udevice *pmic, int buck)
>   		val = pmic_reg_read(pmic, RK817_POWER_SLP_EN(0));
>   		if (val < 0)
>   			return val;
> -		ret = val & mask ? 1 : 0;
> +		ret = (val & mask) ? 1 : 0;
>   		break;
>   	default:
>   		ret = -EINVAL;
> @@ -723,7 +723,7 @@ static int _ldo_get_enable(struct udevice *pmic, int ldo)
>   	if (ret < 0)
>   		return ret;
>   
> -	return ret & mask ? true : false;
> +	return (ret & mask) ? true : false;
>   }
>   
>   static int _nldo_get_enable(struct udevice *pmic, int nldo)
> @@ -980,7 +980,7 @@ static int _ldo_get_suspend_enable(struct udevice *pmic, int ldo)
>   		val = pmic_reg_read(pmic, RK816_REG_LDO_SLP_EN);
>   		if (val < 0)
>   			return val;
> -		ret = val & mask ? 1 : 0;
> +		ret = (val & mask) ? 1 : 0;
>   		break;
>   	case RK808_ID:
>   	case RK818_ID:
> @@ -988,7 +988,7 @@ static int _ldo_get_suspend_enable(struct udevice *pmic, int ldo)
>   		val = pmic_reg_read(pmic, REG_SLEEP_SET_OFF2);
>   		if (val < 0)
>   			return val;
> -		ret = val & mask ? 0 : 1;
> +		ret = (val & mask) ? 0 : 1;
>   		break;
>   	case RK809_ID:
>   	case RK817_ID:
> @@ -997,13 +997,13 @@ static int _ldo_get_suspend_enable(struct udevice *pmic, int ldo)
>   			val = pmic_reg_read(pmic, RK817_POWER_SLP_EN(0));
>   			if (val < 0)
>   				return val;
> -			ret = val & mask ? 1 : 0;
> +			ret = (val & mask) ? 1 : 0;
>   		} else {
>   			mask = 1 << ldo;
>   			val = pmic_reg_read(pmic, RK817_POWER_SLP_EN(1));
>   			if (val < 0)
>   				return val;
> -			ret = val & mask ? 1 : 0;
> +			ret = (val & mask) ? 1 : 0;
>   		}
>   		break;
>   	}
> @@ -1438,7 +1438,7 @@ static int switch_get_enable(struct udevice *dev)
>   	if (ret < 0)
>   		return ret;
>   
> -	return ret & mask ? true : false;
> +	return (ret & mask) ? true : false;
>   }
>   
>   static int switch_set_suspend_value(struct udevice *dev, int uvolt)
> @@ -1493,21 +1493,21 @@ static int switch_get_suspend_enable(struct udevice *dev)
>   		val = pmic_reg_read(dev->parent, REG_SLEEP_SET_OFF1);
>   		if (val < 0)
>   			return val;
> -		ret = val & mask ? 0 : 1;
> +		ret = (val & mask) ? 0 : 1;
>   		break;
>   	case RK809_ID:
>   		mask = 1 << (sw + 6);
>   		val = pmic_reg_read(dev->parent, RK817_POWER_SLP_EN(0));
>   		if (val < 0)
>   			return val;
> -		ret = val & mask ? 1 : 0;
> +		ret = (val & mask) ? 1 : 0;
>   		break;
>   	case RK818_ID:
>   		mask = 1 << 6;
>   		val = pmic_reg_read(dev->parent, REG_SLEEP_SET_OFF1);
>   		if (val < 0)
>   			return val;
> -		ret = val & mask ? 0 : 1;
> +		ret = (val & mask) ? 0 : 1;
>   		break;
>   	}
>   
>
Simon Glass June 6, 2024, 3:04 p.m. UTC | #3 
On Wed, 5 Jun 2024 at 03:33, Quentin Schulz <foss+uboot@0leil.net> wrote:
>
> From: Quentin Schulz <quentin.schulz@cherry.de>
>
> My linter complains that the order isn't clear enough so let's put
> parentheses around the ternary condition to make it happy.
>
> Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
> ---
>  drivers/power/regulator/rk8xx.c | 26 +++++++++++++-------------
>  1 file changed, 13 insertions(+), 13 deletions(-)
>

Reviewed-by: Simon Glass <sjg@chromium.org>
Tested-by: Simon Glass <sjg@chromium.org>  # chromebook-bob
diff mbox series

Patch

diff --git a/drivers/power/regulator/rk8xx.c b/drivers/power/regulator/rk8xx.c
index bd5a37e718f..3125835bc07 100644
--- a/drivers/power/regulator/rk8xx.c
+++ b/drivers/power/regulator/rk8xx.c
@@ -520,7 +520,7 @@  static int _buck_get_enable(struct udevice *pmic, int buck)
 	if (ret < 0)
 		return ret;
 
-	return ret & mask ? true : false;
+	return (ret & mask) ? true : false;
 }
 
 static int _buck_set_suspend_enable(struct udevice *pmic, int buck, bool enable)
@@ -585,7 +585,7 @@  static int _buck_get_suspend_enable(struct udevice *pmic, int buck)
 		val = pmic_reg_read(pmic, RK816_REG_DCDC_SLP_EN);
 		if (val < 0)
 			return val;
-		ret = val & mask ? 1 : 0;
+		ret = (val & mask) ? 1 : 0;
 		break;
 	case RK806_ID:
 		{
@@ -608,7 +608,7 @@  static int _buck_get_suspend_enable(struct udevice *pmic, int buck)
 		val = pmic_reg_read(pmic, REG_SLEEP_SET_OFF1);
 		if (val < 0)
 			return val;
-		ret = val & mask ? 0 : 1;
+		ret = (val & mask) ? 0 : 1;
 		break;
 	case RK809_ID:
 	case RK817_ID:
@@ -620,7 +620,7 @@  static int _buck_get_suspend_enable(struct udevice *pmic, int buck)
 		val = pmic_reg_read(pmic, RK817_POWER_SLP_EN(0));
 		if (val < 0)
 			return val;
-		ret = val & mask ? 1 : 0;
+		ret = (val & mask) ? 1 : 0;
 		break;
 	default:
 		ret = -EINVAL;
@@ -723,7 +723,7 @@  static int _ldo_get_enable(struct udevice *pmic, int ldo)
 	if (ret < 0)
 		return ret;
 
-	return ret & mask ? true : false;
+	return (ret & mask) ? true : false;
 }
 
 static int _nldo_get_enable(struct udevice *pmic, int nldo)
@@ -980,7 +980,7 @@  static int _ldo_get_suspend_enable(struct udevice *pmic, int ldo)
 		val = pmic_reg_read(pmic, RK816_REG_LDO_SLP_EN);
 		if (val < 0)
 			return val;
-		ret = val & mask ? 1 : 0;
+		ret = (val & mask) ? 1 : 0;
 		break;
 	case RK808_ID:
 	case RK818_ID:
@@ -988,7 +988,7 @@  static int _ldo_get_suspend_enable(struct udevice *pmic, int ldo)
 		val = pmic_reg_read(pmic, REG_SLEEP_SET_OFF2);
 		if (val < 0)
 			return val;
-		ret = val & mask ? 0 : 1;
+		ret = (val & mask) ? 0 : 1;
 		break;
 	case RK809_ID:
 	case RK817_ID:
@@ -997,13 +997,13 @@  static int _ldo_get_suspend_enable(struct udevice *pmic, int ldo)
 			val = pmic_reg_read(pmic, RK817_POWER_SLP_EN(0));
 			if (val < 0)
 				return val;
-			ret = val & mask ? 1 : 0;
+			ret = (val & mask) ? 1 : 0;
 		} else {
 			mask = 1 << ldo;
 			val = pmic_reg_read(pmic, RK817_POWER_SLP_EN(1));
 			if (val < 0)
 				return val;
-			ret = val & mask ? 1 : 0;
+			ret = (val & mask) ? 1 : 0;
 		}
 		break;
 	}
@@ -1438,7 +1438,7 @@  static int switch_get_enable(struct udevice *dev)
 	if (ret < 0)
 		return ret;
 
-	return ret & mask ? true : false;
+	return (ret & mask) ? true : false;
 }
 
 static int switch_set_suspend_value(struct udevice *dev, int uvolt)
@@ -1493,21 +1493,21 @@  static int switch_get_suspend_enable(struct udevice *dev)
 		val = pmic_reg_read(dev->parent, REG_SLEEP_SET_OFF1);
 		if (val < 0)
 			return val;
-		ret = val & mask ? 0 : 1;
+		ret = (val & mask) ? 0 : 1;
 		break;
 	case RK809_ID:
 		mask = 1 << (sw + 6);
 		val = pmic_reg_read(dev->parent, RK817_POWER_SLP_EN(0));
 		if (val < 0)
 			return val;
-		ret = val & mask ? 1 : 0;
+		ret = (val & mask) ? 1 : 0;
 		break;
 	case RK818_ID:
 		mask = 1 << 6;
 		val = pmic_reg_read(dev->parent, REG_SLEEP_SET_OFF1);
 		if (val < 0)
 			return val;
-		ret = val & mask ? 0 : 1;
+		ret = (val & mask) ? 0 : 1;
 		break;
 	}