public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-11-27 01:11:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

staging: iio: tsl2x7x: use direct returns

Browse source 
This patch changes the functions tsl2x7x_read_event_value() and
tsl2x7x_read_raw() to use direct returns to simplify the code.

Signed-off-by: Brian Masney <masneyb@onstation.org>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
This commit is contained in:
Brian Masney 2018-05-10 20:12:16 -04:00 • committed by Jonathan Cameron
parent 5cf05135b0
commit 7b4db2e3e6
1 changed files with 16 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
drivers/staging/iio/light/tsl2x7x.c
View file

@ -1014,7 +1014,7 @@ static int tsl2x7x_read_event_value(struct iio_dev *indio_dev,
int *val, int *val2) int *val, int *val2)
{ {
struct tsl2X7X_chip *chip = iio_priv(indio_dev); struct tsl2X7X_chip *chip = iio_priv(indio_dev);
int ret = -EINVAL, filter_delay, mult; int filter_delay, mult;
u8 time; u8 time;
switch (info) { switch (info) {
@ -1023,27 +1023,23 @@ static int tsl2x7x_read_event_value(struct iio_dev *indio_dev,
switch (dir) { switch (dir) {
case IIO_EV_DIR_RISING: case IIO_EV_DIR_RISING:
*val = chip->settings.als_thresh_high; *val = chip->settings.als_thresh_high;
ret = IIO_VAL_INT; return IIO_VAL_INT;
break;
case IIO_EV_DIR_FALLING: case IIO_EV_DIR_FALLING:
*val = chip->settings.als_thresh_low; *val = chip->settings.als_thresh_low;
ret = IIO_VAL_INT; return IIO_VAL_INT;
break;
default: default:
break; return -EINVAL;
} }
} else { } else {
switch (dir) { switch (dir) {
case IIO_EV_DIR_RISING: case IIO_EV_DIR_RISING:
*val = chip->settings.prox_thres_high; *val = chip->settings.prox_thres_high;
ret = IIO_VAL_INT; return IIO_VAL_INT;
break;
case IIO_EV_DIR_FALLING: case IIO_EV_DIR_FALLING:
*val = chip->settings.prox_thres_low; *val = chip->settings.prox_thres_low;
ret = IIO_VAL_INT; return IIO_VAL_INT;
break;
default: default:
break; return -EINVAL;
} }
} }
break; break;
@ -1062,13 +1058,10 @@ static int tsl2x7x_read_event_value(struct iio_dev *indio_dev,
filter_delay = *val2 * mult; filter_delay = *val2 * mult;
*val = filter_delay / 1000; *val = filter_delay / 1000;
*val2 = filter_delay % 1000; *val2 = filter_delay % 1000;
ret = IIO_VAL_INT_PLUS_MICRO; return IIO_VAL_INT_PLUS_MICRO;
break;
default: default:
break; return -EINVAL;
} }
return ret;
} }
static int tsl2x7x_read_raw(struct iio_dev *indio_dev, static int tsl2x7x_read_raw(struct iio_dev *indio_dev,
@ -1078,7 +1071,6 @@ static int tsl2x7x_read_raw(struct iio_dev *indio_dev,
long mask) long mask)
{ {
struct tsl2X7X_chip *chip = iio_priv(indio_dev); struct tsl2X7X_chip *chip = iio_priv(indio_dev);
int ret = -EINVAL;
switch (mask) { switch (mask) {
case IIO_CHAN_INFO_PROCESSED: case IIO_CHAN_INFO_PROCESSED:
@ -1086,12 +1078,10 @@ static int tsl2x7x_read_raw(struct iio_dev *indio_dev,
case IIO_LIGHT: case IIO_LIGHT:
tsl2x7x_get_lux(indio_dev); tsl2x7x_get_lux(indio_dev);
*val = chip->als_cur_info.lux; *val = chip->als_cur_info.lux;
ret = IIO_VAL_INT; return IIO_VAL_INT;
break;
default: default:
return -EINVAL; return -EINVAL;
} }
break;
case IIO_CHAN_INFO_RAW: case IIO_CHAN_INFO_RAW:
switch (chan->type) { switch (chan->type) {
case IIO_INTENSITY: case IIO_INTENSITY:
@ -1100,13 +1090,11 @@ static int tsl2x7x_read_raw(struct iio_dev *indio_dev,
*val = chip->als_cur_info.als_ch0; *val = chip->als_cur_info.als_ch0;
else else
*val = chip->als_cur_info.als_ch1; *val = chip->als_cur_info.als_ch1;
ret = IIO_VAL_INT; return IIO_VAL_INT;
break;
case IIO_PROXIMITY: case IIO_PROXIMITY:
tsl2x7x_get_prox(indio_dev); tsl2x7x_get_prox(indio_dev);
*val = chip->prox_data; *val = chip->prox_data;
ret = IIO_VAL_INT; return IIO_VAL_INT;
break;
default: default:
return -EINVAL; return -EINVAL;
} }
@ -1116,22 +1104,17 @@ static int tsl2x7x_read_raw(struct iio_dev *indio_dev,
*val = tsl2x7x_als_gain[chip->settings.als_gain]; *val = tsl2x7x_als_gain[chip->settings.als_gain];
else else
*val = tsl2x7x_prox_gain[chip->settings.prox_gain]; *val = tsl2x7x_prox_gain[chip->settings.prox_gain];
ret = IIO_VAL_INT; return IIO_VAL_INT;
break;
case IIO_CHAN_INFO_CALIBBIAS: case IIO_CHAN_INFO_CALIBBIAS:
*val = chip->settings.als_gain_trim; *val = chip->settings.als_gain_trim;
ret = IIO_VAL_INT; return IIO_VAL_INT;
break;
case IIO_CHAN_INFO_INT_TIME: case IIO_CHAN_INFO_INT_TIME:
*val = 0; *val = 0;
*val2 = (256 - chip->settings.als_time) * 2720; *val2 = (256 - chip->settings.als_time) * 2720;
ret = IIO_VAL_INT_PLUS_MICRO; return IIO_VAL_INT_PLUS_MICRO;
break;
default: default:
ret = -EINVAL; return -EINVAL;
} }
return ret;
} }
static int tsl2x7x_write_raw(struct iio_dev *indio_dev, static int tsl2x7x_write_raw(struct iio_dev *indio_dev,