diff mbox series

[5/7] power: supply: sbs-battery: fix CAPACITY_MODE bit naming

Message ID 20191101190705.13393-5-jeff.dagenais@gmail.com (mailing list archive)
State Not Applicable, archived
Headers show
Series [1/7] power: supply: sbs-battery: use octal permissions on module param | expand

Commit Message

Jean-François Dagenais Nov. 1, 2019, 7:07 p.m. UTC 
"Battery mode" is the name of the register, the bit manipulated by this
code is "CAPACITY_MODE" (Smart Battery System Specifications).

Signed-off-by: Jean-Francois Dagenais <jeff.dagenais@gmail.com>
---
 drivers/power/supply/sbs-battery.c | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

Comments

Sebastian Reichel Dec. 19, 2019, 1:22 a.m. UTC | #1 
Hi,

On Fri, Nov 01, 2019 at 03:07:03PM -0400, Jean-Francois Dagenais wrote:
> "Battery mode" is the name of the register, the bit manipulated by this
> code is "CAPACITY_MODE" (Smart Battery System Specifications).
> 
> Signed-off-by: Jean-Francois Dagenais <jeff.dagenais@gmail.com>
> ---

Thanks, queued.

-- Sebastian

>  drivers/power/supply/sbs-battery.c | 30 +++++++++++++++---------------
>  1 file changed, 15 insertions(+), 15 deletions(-)
> 
> diff --git a/drivers/power/supply/sbs-battery.c b/drivers/power/supply/sbs-battery.c
> index f92b98d900d2..46c89dd05f46 100644
> --- a/drivers/power/supply/sbs-battery.c
> +++ b/drivers/power/supply/sbs-battery.c
> @@ -46,10 +46,10 @@ enum {
>  
>  /* Battery Mode defines */
>  #define BATTERY_MODE_OFFSET		0x03
> -#define BATTERY_MODE_MASK		0x8000
> -enum sbs_battery_mode {
> -	BATTERY_MODE_AMPS = 0,
> -	BATTERY_MODE_WATTS = 0x8000
> +#define BATTERY_MODE_CAPACITY_MASK	(1<<15)
> +enum sbs_capacity_mode {
> +	CAPACITY_MODE_AMPS = 0,
> +	CAPACITY_MODE_WATTS = BATTERY_MODE_CAPACITY_MASK
>  };
>  
>  /* manufacturer access defines */
> @@ -513,8 +513,8 @@ static void  sbs_unit_adjustment(struct i2c_client *client,
>  	}
>  }
>  
> -static enum sbs_battery_mode sbs_set_battery_mode(struct i2c_client *client,
> -	enum sbs_battery_mode mode)
> +static enum sbs_capacity_mode sbs_set_capacity_mode(struct i2c_client *client,
> +	enum sbs_capacity_mode mode)
>  {
>  	int ret, original_val;
>  
> @@ -522,13 +522,13 @@ static enum sbs_battery_mode sbs_set_battery_mode(struct i2c_client *client,
>  	if (original_val < 0)
>  		return original_val;
>  
> -	if ((original_val & BATTERY_MODE_MASK) == mode)
> +	if ((original_val & BATTERY_MODE_CAPACITY_MASK) == mode)
>  		return mode;
>  
> -	if (mode == BATTERY_MODE_AMPS)
> -		ret = original_val & ~BATTERY_MODE_MASK;
> +	if (mode == CAPACITY_MODE_AMPS)
> +		ret = original_val & ~BATTERY_MODE_CAPACITY_MASK;
>  	else
> -		ret = original_val | BATTERY_MODE_MASK;
> +		ret = original_val | BATTERY_MODE_CAPACITY_MASK;
>  
>  	ret = sbs_write_word_data(client, BATTERY_MODE_OFFSET, ret);
>  	if (ret < 0)
> @@ -536,7 +536,7 @@ static enum sbs_battery_mode sbs_set_battery_mode(struct i2c_client *client,
>  
>  	usleep_range(1000, 2000);
>  
> -	return original_val & BATTERY_MODE_MASK;
> +	return original_val & BATTERY_MODE_CAPACITY_MASK;
>  }
>  
>  static int sbs_get_battery_capacity(struct i2c_client *client,
> @@ -544,12 +544,12 @@ static int sbs_get_battery_capacity(struct i2c_client *client,
>  	union power_supply_propval *val)
>  {
>  	s32 ret;
> -	enum sbs_battery_mode mode = BATTERY_MODE_WATTS;
> +	enum sbs_capacity_mode mode = CAPACITY_MODE_WATTS;
>  
>  	if (power_supply_is_amp_property(psp))
> -		mode = BATTERY_MODE_AMPS;
> +		mode = CAPACITY_MODE_AMPS;
>  
> -	mode = sbs_set_battery_mode(client, mode);
> +	mode = sbs_set_capacity_mode(client, mode);
>  	if (mode < 0)
>  		return mode;
>  
> @@ -559,7 +559,7 @@ static int sbs_get_battery_capacity(struct i2c_client *client,
>  
>  	val->intval = ret;
>  
> -	ret = sbs_set_battery_mode(client, mode);
> +	ret = sbs_set_capacity_mode(client, mode);
>  	if (ret < 0)
>  		return ret;
>  
> -- 
> 2.23.0
>
diff mbox series

Patch

diff --git a/drivers/power/supply/sbs-battery.c b/drivers/power/supply/sbs-battery.c
index f92b98d900d2..46c89dd05f46 100644
--- a/drivers/power/supply/sbs-battery.c
+++ b/drivers/power/supply/sbs-battery.c
@@ -46,10 +46,10 @@  enum {
 
 /* Battery Mode defines */
 #define BATTERY_MODE_OFFSET		0x03
-#define BATTERY_MODE_MASK		0x8000
-enum sbs_battery_mode {
-	BATTERY_MODE_AMPS = 0,
-	BATTERY_MODE_WATTS = 0x8000
+#define BATTERY_MODE_CAPACITY_MASK	(1<<15)
+enum sbs_capacity_mode {
+	CAPACITY_MODE_AMPS = 0,
+	CAPACITY_MODE_WATTS = BATTERY_MODE_CAPACITY_MASK
 };
 
 /* manufacturer access defines */
@@ -513,8 +513,8 @@  static void  sbs_unit_adjustment(struct i2c_client *client,
 	}
 }
 
-static enum sbs_battery_mode sbs_set_battery_mode(struct i2c_client *client,
-	enum sbs_battery_mode mode)
+static enum sbs_capacity_mode sbs_set_capacity_mode(struct i2c_client *client,
+	enum sbs_capacity_mode mode)
 {
 	int ret, original_val;
 
@@ -522,13 +522,13 @@  static enum sbs_battery_mode sbs_set_battery_mode(struct i2c_client *client,
 	if (original_val < 0)
 		return original_val;
 
-	if ((original_val & BATTERY_MODE_MASK) == mode)
+	if ((original_val & BATTERY_MODE_CAPACITY_MASK) == mode)
 		return mode;
 
-	if (mode == BATTERY_MODE_AMPS)
-		ret = original_val & ~BATTERY_MODE_MASK;
+	if (mode == CAPACITY_MODE_AMPS)
+		ret = original_val & ~BATTERY_MODE_CAPACITY_MASK;
 	else
-		ret = original_val | BATTERY_MODE_MASK;
+		ret = original_val | BATTERY_MODE_CAPACITY_MASK;
 
 	ret = sbs_write_word_data(client, BATTERY_MODE_OFFSET, ret);
 	if (ret < 0)
@@ -536,7 +536,7 @@  static enum sbs_battery_mode sbs_set_battery_mode(struct i2c_client *client,
 
 	usleep_range(1000, 2000);
 
-	return original_val & BATTERY_MODE_MASK;
+	return original_val & BATTERY_MODE_CAPACITY_MASK;
 }
 
 static int sbs_get_battery_capacity(struct i2c_client *client,
@@ -544,12 +544,12 @@  static int sbs_get_battery_capacity(struct i2c_client *client,
 	union power_supply_propval *val)
 {
 	s32 ret;
-	enum sbs_battery_mode mode = BATTERY_MODE_WATTS;
+	enum sbs_capacity_mode mode = CAPACITY_MODE_WATTS;
 
 	if (power_supply_is_amp_property(psp))
-		mode = BATTERY_MODE_AMPS;
+		mode = CAPACITY_MODE_AMPS;
 
-	mode = sbs_set_battery_mode(client, mode);
+	mode = sbs_set_capacity_mode(client, mode);
 	if (mode < 0)
 		return mode;
 
@@ -559,7 +559,7 @@  static int sbs_get_battery_capacity(struct i2c_client *client,
 
 	val->intval = ret;
 
-	ret = sbs_set_battery_mode(client, mode);
+	ret = sbs_set_capacity_mode(client, mode);
 	if (ret < 0)
 		return ret;