summary refs log tree commit diff
path: root/drivers/power/supply
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2019-05-11 10:56:14 +0200
committerSebastian Reichel <sebastian.reichel@collabora.com>2019-05-14 23:17:56 +0200
commitbaf5964ecfe19a0109fe2e497e72840ce0f488e6 (patch)
tree595f2fd4be71744c0b1edd364a4b9a681adb8556 /drivers/power/supply
parentc8f3c9fe83cafc94679007b9c0083ee25d5735e0 (diff)
downloadlinux-baf5964ecfe19a0109fe2e497e72840ce0f488e6.tar.gz
power: supply: olpc_battery: force the le/be casts
The endianness of data returned from the EC depends on the particular EC
version determined at run time. Cast from little/big endian explicitey
in the routine that flips endianness to the native one to make sparse
happy.

Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
Reported-by: kbuild test robot <lkp@intel.com>
Fixes: 76311b9a3295 ("power: supply: olpc_battery: Add OLPC XO 1.75 support")
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Diffstat (limited to 'drivers/power/supply')
-rw-r--r--drivers/power/supply/olpc_battery.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/power/supply/olpc_battery.c b/drivers/power/supply/olpc_battery.c
index c628d3a47e14..7720e4c2ac0b 100644
--- a/drivers/power/supply/olpc_battery.c
+++ b/drivers/power/supply/olpc_battery.c
@@ -327,9 +327,9 @@ static int olpc_bat_get_voltage_max_design(union power_supply_propval *val)
 static u16 ecword_to_cpu(struct olpc_battery_data *data, u16 ec_word)
 {
 	if (data->little_endian)
-		return le16_to_cpu(ec_word);
+		return le16_to_cpu((__force __le16)ec_word);
 	else
-		return be16_to_cpu(ec_word);
+		return be16_to_cpu((__force __be16)ec_word);
 }
 
 /*********************************************************************
@@ -341,7 +341,7 @@ static int olpc_bat_get_property(struct power_supply *psy,
 {
 	struct olpc_battery_data *data = power_supply_get_drvdata(psy);
 	int ret = 0;
-	__be16 ec_word;
+	u16 ec_word;
 	uint8_t ec_byte;
 	__be64 ser_buf;