Commit 5f1d651f authored by Karim Eshapa's avatar Karim Eshapa Committed by Jonathan Cameron

staging:iio:accel:adis16240: sign extend function replace hard code duplication

Use sign_extend32 kernel function instead of code duplication,
Safe also for 16 bit. and remove declaration of bits variable not needed.
Signed-off-by: default avatarKarim Eshapa <karim.eshapa@gmail.com>
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent 5126aec5
...@@ -250,7 +250,6 @@ static int adis16240_read_raw(struct iio_dev *indio_dev, ...@@ -250,7 +250,6 @@ static int adis16240_read_raw(struct iio_dev *indio_dev,
{ {
struct adis *st = iio_priv(indio_dev); struct adis *st = iio_priv(indio_dev);
int ret; int ret;
int bits;
u8 addr; u8 addr;
s16 val16; s16 val16;
...@@ -287,24 +286,18 @@ static int adis16240_read_raw(struct iio_dev *indio_dev, ...@@ -287,24 +286,18 @@ static int adis16240_read_raw(struct iio_dev *indio_dev,
*val = 25000 / 244 - 0x133; /* 25 C = 0x133 */ *val = 25000 / 244 - 0x133; /* 25 C = 0x133 */
return IIO_VAL_INT; return IIO_VAL_INT;
case IIO_CHAN_INFO_CALIBBIAS: case IIO_CHAN_INFO_CALIBBIAS:
bits = 10;
addr = adis16240_addresses[chan->scan_index][0]; addr = adis16240_addresses[chan->scan_index][0];
ret = adis_read_reg_16(st, addr, &val16); ret = adis_read_reg_16(st, addr, &val16);
if (ret) if (ret)
return ret; return ret;
val16 &= (1 << bits) - 1; *val = sign_extend32(val16, 9);
val16 = (s16)(val16 << (16 - bits)) >> (16 - bits);
*val = val16;
return IIO_VAL_INT; return IIO_VAL_INT;
case IIO_CHAN_INFO_PEAK: case IIO_CHAN_INFO_PEAK:
bits = 10;
addr = adis16240_addresses[chan->scan_index][1]; addr = adis16240_addresses[chan->scan_index][1];
ret = adis_read_reg_16(st, addr, &val16); ret = adis_read_reg_16(st, addr, &val16);
if (ret) if (ret)
return ret; return ret;
val16 &= (1 << bits) - 1; *val = sign_extend32(val16, 9);
val16 = (s16)(val16 << (16 - bits)) >> (16 - bits);
*val = val16;
return IIO_VAL_INT; return IIO_VAL_INT;
} }
return -EINVAL; return -EINVAL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment