iio:humidity:si7020: cleanup read_raw and probe

[firefly-linux-kernel-4.4.55.git] / drivers / iio / humidity / si7020.c

diff --git a/drivers/iio/humidity/si7020.c b/drivers/iio/humidity/si7020.c
index e336af713f20852df36ae0e48195575e5e6bb689..69e49f58a4550f567308644b9a39ff523500577f 100644 (file)
--- 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);