summaryrefslogtreecommitdiff
path: root/drivers/iio/humidity
diff options
context:
space:
mode:
authorHartmut Knaack <knaack.h@gmx.de>2014-10-25 20:09:11 +0200
committerJonathan Cameron <jic23@kernel.org>2014-10-25 20:55:56 +0100
commit345b48307d6961183be77748fc0ae5dd660c91a8 (patch)
tree02e24480a1a2e8bd58395f212f3b76b9dff89d11 /drivers/iio/humidity
parentacd8256723f286b7217801fbed24503f8565b91e (diff)
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>
Diffstat (limited to 'drivers/iio/humidity')
-rw-r--r--drivers/iio/humidity/si7020.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/iio/humidity/si7020.c b/drivers/iio/humidity/si7020.c
index e336af713f20..69e49f58a455 100644
--- a/drivers/iio/humidity/si7020.c
+++ b/drivers/iio/humidity/si7020.c
@@ -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;
+ *val = ret >> 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);