Skip to contentSkip to conversation

bq27x00_battery: use unaligned access helper

PATCH New Harvey Harrison 1 participant 1 message Sep 4, 2008

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 bq27x00_battery: use unaligned access helper

Remove hand-rolled get_unaligned_be16, this points to a possible bug as bq27x00_read does another endian byteswap which sparse notices:

drivers/power/bq27x00_battery.c:81:14: warning: cast to restricted __be16 Which should probably be checked.

---
New in next-20080902

Also all of these functions could (should) change to passing around a u16 rather than an int as the read function only ever reads 1 or two bytes.

 drivers/power/bq27x00_battery.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/power/bq27x00_battery.c +2 -2
index 62d4948..a5a49e1 100644
@@ -23,6 +23,7 @@
 #include <linux/platform_device.h>
 #include <linux/power_supply.h>
 #include <linux/idr.h>
+#include <asm/unaligned.h>
 
 #include <linux/i2c.h>
 
@@ -33,7 +34,6 @@
 #define BQ27x00_REG_RSOC		0x0B /* Relative State-of-Charge */
 #define BQ27x00_REG_AI			0x14
 #define BQ27x00_REG_FLAGS		0x0A
-#define HIGH_BYTE(A)			((A) << 8)
 
 /* If the system has several batteries we need a different name for each
  * of them...
@@ -239,7 +239,7 @@ static int bq27200_read(u8 reg, int *rt_value, int b_single,
 		err = i2c_transfer(client->adapter, msg, 1);
 		if (err >= 0) {
 			if (!b_single)
-				*rt_value = data[1] | HIGH_BYTE(data[0]);
+				*rt_value = get_unaligned_be16(data);
 			else
 				*rt_value = data[0];
 
Signature · 1 line
1.6.0.1.514.g59380c