Commit aad54091 authored by Gwendal Grignou's avatar Gwendal Grignou Committed by Jonathan Cameron

iio: ti-ads1015: Remove shift variable ads1015_read_raw

By using scan_type.realbits when processing raw data,
we use scan_type.shit only once, thus we don't need to define a local
variable for it anymore.
Signed-off-by: default avatarGwendal Grignou <gwendal@chromium.org>
Link: https://lore.kernel.org/r/20211104082413.3681212-12-gwendal@chromium.orgSigned-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent 4d57fb54
...@@ -464,9 +464,7 @@ static int ads1015_read_raw(struct iio_dev *indio_dev, ...@@ -464,9 +464,7 @@ static int ads1015_read_raw(struct iio_dev *indio_dev,
mutex_lock(&data->lock); mutex_lock(&data->lock);
switch (mask) { switch (mask) {
case IIO_CHAN_INFO_RAW: { case IIO_CHAN_INFO_RAW:
int shift = chan->scan_type.shift;
ret = iio_device_claim_direct_mode(indio_dev); ret = iio_device_claim_direct_mode(indio_dev);
if (ret) if (ret)
break; break;
...@@ -487,7 +485,8 @@ static int ads1015_read_raw(struct iio_dev *indio_dev, ...@@ -487,7 +485,8 @@ static int ads1015_read_raw(struct iio_dev *indio_dev,
goto release_direct; goto release_direct;
} }
*val = sign_extend32(*val >> shift, 15 - shift); *val = sign_extend32(*val >> chan->scan_type.shift,
chan->scan_type.realbits - 1);
ret = ads1015_set_power_state(data, false); ret = ads1015_set_power_state(data, false);
if (ret < 0) if (ret < 0)
...@@ -497,7 +496,6 @@ static int ads1015_read_raw(struct iio_dev *indio_dev, ...@@ -497,7 +496,6 @@ static int ads1015_read_raw(struct iio_dev *indio_dev,
release_direct: release_direct:
iio_device_release_direct_mode(indio_dev); iio_device_release_direct_mode(indio_dev);
break; break;
}
case IIO_CHAN_INFO_SCALE: case IIO_CHAN_INFO_SCALE:
idx = data->channel_data[chan->address].pga; idx = data->channel_data[chan->address].pga;
*val = ads1015_fullscale_range[idx]; *val = ads1015_fullscale_range[idx];
......
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