From: Michael Hennerich <michael.hennerich@xxxxxxxxxx> Cleanup result extraction and update license notice, no functional changes. Signed-off-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx> Acked-by: Jonathan Cameron <jic23@xxxxxxxxx> --- drivers/staging/iio/gyro/adxrs450_core.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/staging/iio/gyro/adxrs450_core.c b/drivers/staging/iio/gyro/adxrs450_core.c index a1a71b7..c02e3ef 100644 --- a/drivers/staging/iio/gyro/adxrs450_core.c +++ b/drivers/staging/iio/gyro/adxrs450_core.c @@ -3,7 +3,7 @@ * * Copyright 2011 Analog Devices Inc. * - * Licensed under the GPL-2 or later. + * Licensed under the GPL-2. */ #include <linux/interrupt.h> @@ -69,7 +69,7 @@ static int adxrs450_spi_read_reg_16(struct device *dev, goto error_ret; } - *val = (st->rx[1] & 0x1f) << 11 | st->rx[2] << 3 | (st->rx[3] & 0xe0) >> 5; + *val = (be32_to_cpu(*(u32 *)st->rx) >> 5) & 0xFFFF; error_ret: mutex_unlock(&st->buf_lock); @@ -152,7 +152,8 @@ static int adxrs450_spi_sensor_data(struct device *dev, u16 *val) goto error_ret; } - *val = (st->rx[0] & 0x03) << 14 | st->rx[1] << 6 | (st->rx[2] & 0xfc) >> 2; + *val = (be32_to_cpu(*(u32 *)st->rx) >> 10) & 0xFFFF; + error_ret: mutex_unlock(&st->buf_lock); return ret; -- 1.6.0.2 -- To unsubscribe from this list: send the line "unsubscribe linux-iio" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
