Commit 88198d2b authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Jonathan Cameron

staging:iio:ad7291: Use sign_extend32 instead of open-coding it

This makes it a bit more obvious what is going on than open-coding it.
Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent 7bd49fe1
...@@ -275,7 +275,6 @@ static int ad7291_read_event_value(struct iio_dev *indio_dev, ...@@ -275,7 +275,6 @@ static int ad7291_read_event_value(struct iio_dev *indio_dev,
struct ad7291_chip_info *chip = iio_priv(indio_dev); struct ad7291_chip_info *chip = iio_priv(indio_dev);
int ret; int ret;
u16 uval; u16 uval;
s16 signval;
ret = ad7291_i2c_read(chip, ad7291_threshold_reg(event_code), &uval); ret = ad7291_i2c_read(chip, ad7291_threshold_reg(event_code), &uval);
if (ret < 0) if (ret < 0)
...@@ -286,8 +285,7 @@ static int ad7291_read_event_value(struct iio_dev *indio_dev, ...@@ -286,8 +285,7 @@ static int ad7291_read_event_value(struct iio_dev *indio_dev,
*val = uval & AD7291_VALUE_MASK; *val = uval & AD7291_VALUE_MASK;
return 0; return 0;
case IIO_TEMP: case IIO_TEMP:
signval = (s16)((uval & AD7291_VALUE_MASK) << 4) >> 4; *val = sign_extend32(uval, 11);
*val = signval;
return 0; return 0;
default: default:
return -EINVAL; return -EINVAL;
...@@ -397,7 +395,6 @@ static int ad7291_read_raw(struct iio_dev *indio_dev, ...@@ -397,7 +395,6 @@ static int ad7291_read_raw(struct iio_dev *indio_dev,
int ret; int ret;
struct ad7291_chip_info *chip = iio_priv(indio_dev); struct ad7291_chip_info *chip = iio_priv(indio_dev);
u16 regval; u16 regval;
s16 signval;
switch (mask) { switch (mask) {
case IIO_CHAN_INFO_RAW: case IIO_CHAN_INFO_RAW:
...@@ -433,8 +430,7 @@ static int ad7291_read_raw(struct iio_dev *indio_dev, ...@@ -433,8 +430,7 @@ static int ad7291_read_raw(struct iio_dev *indio_dev,
AD7291_T_SENSE); AD7291_T_SENSE);
if (ret < 0) if (ret < 0)
return ret; return ret;
signval = (s16)((ret & AD7291_VALUE_MASK) << 4) >> 4; *val = sign_extend32(ret, 11);
*val = signval;
return IIO_VAL_INT; return IIO_VAL_INT;
default: default:
return -EINVAL; return -EINVAL;
...@@ -444,8 +440,7 @@ static int ad7291_read_raw(struct iio_dev *indio_dev, ...@@ -444,8 +440,7 @@ static int ad7291_read_raw(struct iio_dev *indio_dev,
AD7291_T_AVERAGE); AD7291_T_AVERAGE);
if (ret < 0) if (ret < 0)
return ret; return ret;
signval = (s16)((ret & AD7291_VALUE_MASK) << 4) >> 4; *val = sign_extend32(ret, 11);
*val = signval;
return IIO_VAL_INT; return IIO_VAL_INT;
case IIO_CHAN_INFO_SCALE: case IIO_CHAN_INFO_SCALE:
switch (chan->type) { switch (chan->type) {
......
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