Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

iio: light: vcnl4000: Cleanup read_raw() returns

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

authored by

Peter Meerwald-Stadler and committed by
Jonathan Cameron
5d693139 ff6a5259

+12 -17
+12 -17
drivers/iio/light/vcnl4000.c
··· 109 109 struct iio_chan_spec const *chan, 110 110 int *val, int *val2, long mask) 111 111 { 112 - int ret = -EINVAL; 112 + int ret; 113 113 struct vcnl4000_data *data = iio_priv(indio_dev); 114 114 115 115 switch (mask) { ··· 121 121 VCNL4000_AL_RESULT_HI, val); 122 122 if (ret < 0) 123 123 return ret; 124 - ret = IIO_VAL_INT; 125 - break; 124 + return IIO_VAL_INT; 126 125 case IIO_PROXIMITY: 127 126 ret = vcnl4000_measure(data, 128 127 VCNL4000_PS_OD, VCNL4000_PS_RDY, 129 128 VCNL4000_PS_RESULT_HI, val); 130 129 if (ret < 0) 131 130 return ret; 132 - ret = IIO_VAL_INT; 133 - break; 131 + return IIO_VAL_INT; 134 132 default: 135 - break; 133 + return -EINVAL; 136 134 } 137 - break; 138 135 case IIO_CHAN_INFO_SCALE: 139 - if (chan->type == IIO_LIGHT) { 140 - *val = 0; 141 - *val2 = 250000; 142 - ret = IIO_VAL_INT_PLUS_MICRO; 143 - } 144 - break; 145 - default: 146 - break; 147 - } 136 + if (chan->type != IIO_LIGHT) 137 + return -EINVAL; 148 138 149 - return ret; 139 + *val = 0; 140 + *val2 = 250000; 141 + return IIO_VAL_INT_PLUS_MICRO; 142 + default: 143 + return -EINVAL; 144 + } 150 145 } 151 146 152 147 static const struct iio_info vcnl4000_info = {