@@ -58,7 +58,7 @@ static int ad2s1200_read_raw(struct iio_dev *indio_dev,
{
struct ad2s1200_state *st = iio_priv(indio_dev);
int ret = 0;
- s16 vel;
+ u16 vel;
mutex_lock(&st->lock);
gpio_set_value(st->sample, 0);
@@ -74,14 +74,13 @@ static int ad2s1200_read_raw(struct iio_dev *indio_dev,
return ret;
}
+ vel = be16_to_cpup((__be16 *)st->rx);
switch (chan->type) {
case IIO_ANGL:
- *val = (((u16)(st->rx[0])) << 4) | ((st->rx[1] & 0xF0) >> 4);
+ *val = vel >> 4;
break;
case IIO_ANGL_VEL:
- vel = (((s16)(st->rx[0])) << 4) | ((st->rx[1] & 0xF0) >> 4);
- vel = sign_extend32(vel, 11);
- *val = vel;
+ *val = sign_extend32((s16)vel >> 4, 11);
break;
default:
mutex_unlock(&st->lock);
The manual states that the data is contained in the upper 12 bits of the 16 bits read by spi. The code that extracts these 12 bits is correct for both be and le machines, but this is not clear from a first glance. To improve readability the relevant expressions are replaced with equivalent expressions that use be16_to_cpup. Signed-off-by: David Veenstra <davidjulianveenstra@gmail.com> --- drivers/staging/iio/resolver/ad2s1200.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)