firmware: arm_scpi: improve struct sensor_value

lo_val and hi_val together in this order are a little endian 64 bit value.
Therefore we can simplify struct sensor_value and the code by defining
it as a __le64 value and by using le64_to_cpu.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
This commit is contained in:
Heiner Kallweit 2017-10-04 21:05:17 +02:00 committed by Sudeep Holla
parent 4864dca72d
commit 5c7ae6467d
1 changed files with 5 additions and 7 deletions

View File

@ -347,9 +347,8 @@ struct _scpi_sensor_info {
}; };
struct sensor_value { struct sensor_value {
__le32 lo_val; __le64 val;
__le32 hi_val; };
} __packed;
struct dev_pstate_set { struct dev_pstate_set {
__le16 dev_id; __le16 dev_id;
@ -785,11 +784,10 @@ static int scpi_sensor_get_value(u16 sensor, u64 *val)
return ret; return ret;
if (scpi_info->is_legacy) if (scpi_info->is_legacy)
/* only 32-bits supported, hi_val can be junk */ /* only 32-bits supported, upper 32 bits can be junk */
*val = le32_to_cpu(buf.lo_val); *val = le32_to_cpup((__le32 *)&buf.val);
else else
*val = (u64)le32_to_cpu(buf.hi_val) << 32 | *val = le64_to_cpu(buf.val);
le32_to_cpu(buf.lo_val);
return 0; return 0;
} }