forked from Minki/linux
iio:humidity:si7020: cleanup read_raw and probe
When reading temperature or humidity values, a shift of two bits to the right needs to be applied, and only for the humidity channel a mask of the lower 12 bits needs to be applied. This reduces code repetition. During probe, i2c_set_clientdata() was used, although its counterpart was not, so drop it. Signed-off-by: Hartmut Knaack <knaack.h@gmx.de> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
This commit is contained in:
parent
acd8256723
commit
345b48307d
@ -56,10 +56,9 @@ static int si7020_read_raw(struct iio_dev *indio_dev,
|
||||
SI7020CMD_RH_HOLD);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
if (chan->type == IIO_TEMP)
|
||||
*val = ret >> 2;
|
||||
else
|
||||
*val = (ret & 0x3FFF) >> 2;
|
||||
if (chan->type == IIO_HUMIDITYRELATIVE)
|
||||
*val &= GENMASK(11, 0);
|
||||
return IIO_VAL_INT;
|
||||
case IIO_CHAN_INFO_SCALE:
|
||||
if (chan->type == IIO_TEMP)
|
||||
@ -133,7 +132,6 @@ static int si7020_probe(struct i2c_client *client,
|
||||
|
||||
data = iio_priv(indio_dev);
|
||||
*data = client;
|
||||
i2c_set_clientdata(client, indio_dev);
|
||||
|
||||
indio_dev->dev.parent = &client->dev;
|
||||
indio_dev->name = dev_name(&client->dev);
|
||||
|
Loading…
Reference in New Issue
Block a user