iio: light: vcnl4000: Cleanup read_raw() returns

Signed-off-by: Peter Meerwald-Stadler <pmeerw@pmeerw.net>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>

diff --git a/drivers/iio/light/vcnl4000.c b/drivers/iio/light/vcnl4000.c
index 7f247edb134bd452f4e8e2cca68fea0aff0ac470..9f94b6ba39841dc8036adc6cf822622e0f882891 100644 (file)
--- a/drivers/iio/light/vcnl4000.c
+++ b/drivers/iio/light/vcnl4000.c
@@ -109,7 +109,7 @@ static int vcnl4000_read_raw(struct iio_dev *indio_dev,
                                struct iio_chan_spec const *chan,
                                int *val, int *val2, long mask)
 {
-       int ret = -EINVAL;
+       int ret;
        struct vcnl4000_data *data = iio_priv(indio_dev);
 
        switch (mask) {
@@ -121,32 +121,27 @@ static int vcnl4000_read_raw(struct iio_dev *indio_dev,
                                VCNL4000_AL_RESULT_HI, val);
                        if (ret < 0)
                                return ret;
-                       ret = IIO_VAL_INT;
-                       break;
+                       return IIO_VAL_INT;
                case IIO_PROXIMITY:
                        ret = vcnl4000_measure(data,
                                VCNL4000_PS_OD, VCNL4000_PS_RDY,
                                VCNL4000_PS_RESULT_HI, val);
                        if (ret < 0)
                                return ret;
-                       ret = IIO_VAL_INT;
-                       break;
+                       return IIO_VAL_INT;
                default:
-                       break;
+                       return -EINVAL;
                }
-               break;
        case IIO_CHAN_INFO_SCALE:
-               if (chan->type == IIO_LIGHT) {
-                       *val = 0;
-                       *val2 = 250000;
-                       ret = IIO_VAL_INT_PLUS_MICRO;
-               }
-               break;
+               if (chan->type != IIO_LIGHT)
+                       return -EINVAL;
+
+               *val = 0;
+               *val2 = 250000;
+               return IIO_VAL_INT_PLUS_MICRO;
        default:
-               break;
+               return -EINVAL;
        }
-
-       return ret;
 }
 
 static const struct iio_info vcnl4000_info = {