Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 345b4830 authored by Hartmut Knaack's avatar Hartmut Knaack Committed by Jonathan Cameron
Browse files

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: default avatarHartmut Knaack <knaack.h@gmx.de>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent acd82567

drivers/iio/humidity/si7020.c

+3 −5
Original line number Diff line number Diff line
@@ -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);