iio: vcnl4000: Use a single return when getting IIO_CHAN_INFO_RAW
authorGuido Günther <agx@sigxcpu.org>
Mon, 3 Feb 2020 09:17:01 +0000 (10:17 +0100)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Fri, 14 Feb 2020 15:06:24 +0000 (15:06 +0000)
This will be useful when introducing runtime pm.

Signed-off-by: Guido Günther <agx@sigxcpu.org>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
drivers/iio/light/vcnl4000.c

index b0e241a..8f19838 100644 (file)
@@ -335,17 +335,18 @@ static int vcnl4000_read_raw(struct iio_dev *indio_dev,
                switch (chan->type) {
                case IIO_LIGHT:
                        ret = data->chip_spec->measure_light(data, val);
-                       if (ret < 0)
-                               return ret;
-                       return IIO_VAL_INT;
+                       if (!ret)
+                               ret = IIO_VAL_INT;
+                       break;
                case IIO_PROXIMITY:
                        ret = data->chip_spec->measure_proximity(data, val);
-                       if (ret < 0)
-                               return ret;
-                       return IIO_VAL_INT;
+                       if (!ret)
+                               ret = IIO_VAL_INT;
+                       break;
                default:
-                       return -EINVAL;
+                       ret = -EINVAL;
                }
+               return ret;
        case IIO_CHAN_INFO_SCALE:
                if (chan->type != IIO_LIGHT)
                        return -EINVAL;