Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1546658

[PATCH v2 10/11] power: supply: bq275xx: cleanup over temperature flag check.

Show all headers | View raw

From: Chris Lapa <chris@lapa.com.au>

Separated the check out into its own function to make its functionality
easier to understand.

Signed-off-by: Chris Lapa <chris@lapa.com.au>
---
 drivers/power/supply/bq27xxx_battery.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/drivers/power/supply/bq27xxx_battery.c b/drivers/power/supply/bq27xxx_battery.c
index c92c809..e647bd1 100644
--- a/drivers/power/supply/bq27xxx_battery.c
+++ b/drivers/power/supply/bq27xxx_battery.c
@@ -956,14 +956,22 @@ static int bq27xxx_battery_read_pwr_avg(struct bq27xxx_device_info *di)
 }
 
 /*
- * Returns true if a battery over temperature condition is detected
+ * Returns true if the device has multiple over temperature flags
  */
-static bool bq27xxx_battery_overtemp(struct bq27xxx_device_info *di, u16 flags)
+static inline bool bq27xxx_has_multiple_overtemp_flags(const struct bq27xxx_device_info *di)
 {
-	if (di->chip == BQ275XX || di->chip == BQ27500 || di->chip == BQ27510G1
+	return di->chip == BQ275XX || di->chip == BQ27500 || di->chip == BQ27510G1
 			|| di->chip == BQ27510G2 || di->chip == BQ27510G3 || di->chip == BQ27541
 			|| di->chip == BQ27520G1 || di->chip == BQ27520G2 || di->chip == BQ27520G3
-			|| di->chip == BQ27520G4 || di->chip == BQ27545)
+			|| di->chip == BQ27520G4 || di->chip == BQ27545;
+}
+
+/*
+ * Returns true if a battery over temperature condition is detected
+ */
+static bool bq27xxx_battery_overtemp(struct bq27xxx_device_info *di, u16 flags)
+{
+	if (bq27xxx_has_multiple_overtemp_flags(di))
 		return flags & (BQ27XXX_FLAG_OTC | BQ27XXX_FLAG_OTD);
 	if (di->chip == BQ27530 || di->chip == BQ27421)
 		return flags & BQ27XXX_FLAG_OT;
-- 
2.1.4

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 00/10] power: supply: bq275xx: implement individual chip revision support Chris Lapa <chris@lapa.com.au> - 2016-12-22 02:40 +0100
  [PATCH 01/10] power: supplies: bq275xx: rename BQ27500 allow for deprecation in future. Chris Lapa <chris@lapa.com.au> - 2016-12-22 02:40 +0100
  [PATCH v2 08/11] power: supplies: bq275xx: adds specific support for bq27520-g3 revision. Chris Lapa <chris@lapa.com.au> - 2016-12-23 01:10 +0100
  [PATCH v2 01/11] power: supplies: bq275xx: rename BQ27500 allow for deprecation in future. Chris Lapa <chris@lapa.com.au> - 2016-12-23 01:10 +0100
  [PATCH v2 10/11] power: supply: bq275xx: cleanup over temperature flag check. Chris Lapa <chris@lapa.com.au> - 2016-12-23 01:10 +0100
  [PATCH v2 07/11] power: supplies: bq275xx: adds specific support for bq27520-g2 revision. Chris Lapa <chris@lapa.com.au> - 2016-12-23 01:10 +0100
  [PATCH v2 09/11] power: supplies: bq275xx: adds specific support for bq27520-g4 revision. Chris Lapa <chris@lapa.com.au> - 2016-12-23 01:10 +0100
  [PATCH v2 03/11] power: supplies: bq275xx: adds specific support for bq27510-g1 revision. Chris Lapa <chris@lapa.com.au> - 2016-12-23 01:10 +0100
  [PATCH v2 05/11] power: supplies: bq275xx: adds specific support for bq27510-g3 revision. Chris Lapa <chris@lapa.com.au> - 2016-12-23 01:10 +0100
  [PATCH v2 02/11] power: supplies: bq275xx: adds specific support for bq27500/1 revision. Chris Lapa <chris@lapa.com.au> - 2016-12-23 01:10 +0100
  [PATCH v2 11/11] power: supplies: bq275xx: adds device tree binding documentation. Chris Lapa <chris@lapa.com.au> - 2016-12-23 01:10 +0100
  [PATCH v2 00/11] power: supply: bq275xx: implement individual chip revision support Chris Lapa <chris@lapa.com.au> - 2016-12-23 01:10 +0100
    [PATCH v2 04/11] power: supplies: bq275xx: adds specific support for bq27510-g2 revision. Chris Lapa <chris@lapa.com.au> - 2016-12-23 01:10 +0100
    [PATCH v2 06/11] power: supplies: bq275xx: adds specific support for bq27520-g1 revision. Chris Lapa <chris@lapa.com.au> - 2016-12-23 01:10 +0100

csiph-web