Skip to content

L
linux
Commit be78f70c authored by Brian Masney's avatar Brian Masney Committed by Jonathan Cameron
Browse files
Options

staging: iio: tsl2x7x: refactor {read,write}_event_value to allow handling multiple iio_event_infos 

tsl2x7x_read_thresh() and tsl2x7x_write_thresh() currently assumes
that IIO_EV_INFO_VALUE is the only iio_event_info that will be
passed in.  This patch refactors these two functions so that
additional iio_event_infos can be passed in. The functions are
renamed from tsl2x7x_{read,write}_thresh() to
tsl2x7x_{read,write}_event_value(). This patch also adds the
missing return value check to tsl2x7x_invoke_change() since this
was previously missing. This patch is in preparation for moving
the in_intensity0_thresh_period and in_proximity0_thresh_period sysfs
attributes to be created by iio_event_spec.
Signed-off-by: default avatarBrian Masney <masneyb@onstation.org>
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent 1b4cbe2e
Hide whitespace changes
Inline Side-by-side
Showing with 90 additions and 67 deletions
drivers/staging/iio/light/tsl2x7x.c
View file @ be78f70c
...@@ -1218,78 +1218,101 @@ static int tsl2x7x_write_interrupt_config(struct iio_dev *indio_dev, ...@@ -1218,78 +1218,101 @@ static int tsl2x7x_write_interrupt_config(struct iio_dev *indio_dev,
return 0; return 0;
} }
static int tsl2x7x_write_thresh(struct iio_dev *indio_dev, static int tsl2x7x_write_event_value(struct iio_dev *indio_dev,
const struct iio_chan_spec *chan, const struct iio_chan_spec *chan,
enum iio_event_type type, enum iio_event_type type,
enum iio_event_direction dir, enum iio_event_direction dir,
enum iio_event_info info, enum iio_event_info info,
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;
if (chan->type == IIO_INTENSITY) { switch (info) {
switch (dir) { case IIO_EV_INFO_VALUE:
case IIO_EV_DIR_RISING: if (chan->type == IIO_INTENSITY) {
chip->tsl2x7x_settings.als_thresh_high = val; switch (dir) {
break; case IIO_EV_DIR_RISING:
case IIO_EV_DIR_FALLING: chip->tsl2x7x_settings.als_thresh_high = val;
chip->tsl2x7x_settings.als_thresh_low = val; ret = 0;
break; break;
default: case IIO_EV_DIR_FALLING:
return -EINVAL; chip->tsl2x7x_settings.als_thresh_low = val;
} ret = 0;
} else { break;
switch (dir) { default:
case IIO_EV_DIR_RISING: break;
chip->tsl2x7x_settings.prox_thres_high = val; }
break; } else {
case IIO_EV_DIR_FALLING: switch (dir) {
chip->tsl2x7x_settings.prox_thres_low = val; case IIO_EV_DIR_RISING:
break; chip->tsl2x7x_settings.prox_thres_high = val;
default: ret = 0;
return -EINVAL; break;
case IIO_EV_DIR_FALLING:
chip->tsl2x7x_settings.prox_thres_low = val;
ret = 0;
break;
default:
break;
}
} }
break;
default:
break;
} }
tsl2x7x_invoke_change(indio_dev); if (ret < 0)
return ret;
return 0; return tsl2x7x_invoke_change(indio_dev);
} }
static int tsl2x7x_read_thresh(struct iio_dev *indio_dev, static int tsl2x7x_read_event_value(struct iio_dev *indio_dev,
const struct iio_chan_spec *chan, const struct iio_chan_spec *chan,
enum iio_event_type type, enum iio_event_type type,
enum iio_event_direction dir, enum iio_event_direction dir,
enum iio_event_info info, enum iio_event_info info,
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;
if (chan->type == IIO_INTENSITY) { switch (info) {
switch (dir) { case IIO_EV_INFO_VALUE:
case IIO_EV_DIR_RISING: if (chan->type == IIO_INTENSITY) {
*val = chip->tsl2x7x_settings.als_thresh_high; switch (dir) {
break; case IIO_EV_DIR_RISING:
case IIO_EV_DIR_FALLING: *val = chip->tsl2x7x_settings.als_thresh_high;
*val = chip->tsl2x7x_settings.als_thresh_low; ret = IIO_VAL_INT;
break; break;
default: case IIO_EV_DIR_FALLING:
return -EINVAL; *val = chip->tsl2x7x_settings.als_thresh_low;
} ret = IIO_VAL_INT;
} else { break;
switch (dir) { default:
case IIO_EV_DIR_RISING: break;
*val = chip->tsl2x7x_settings.prox_thres_high; }
break; } else {
case IIO_EV_DIR_FALLING: switch (dir) {
*val = chip->tsl2x7x_settings.prox_thres_low; case IIO_EV_DIR_RISING:
break; *val = chip->tsl2x7x_settings.prox_thres_high;
default: ret = IIO_VAL_INT;
return -EINVAL; break;
case IIO_EV_DIR_FALLING:
*val = chip->tsl2x7x_settings.prox_thres_low;
ret = IIO_VAL_INT;
break;
default:
break;
}
} }
break;
default:
break;
} }
return IIO_VAL_INT; return ret;
} }
static int tsl2x7x_read_raw(struct iio_dev *indio_dev, static int tsl2x7x_read_raw(struct iio_dev *indio_dev,
...@@ -1614,8 +1637,8 @@ static const struct iio_info tsl2X7X_device_info[] = { ...@@ -1614,8 +1637,8 @@ static const struct iio_info tsl2X7X_device_info[] = {
.driver_module = THIS_MODULE, .driver_module = THIS_MODULE,
.read_raw = &tsl2x7x_read_raw, .read_raw = &tsl2x7x_read_raw,
.write_raw = &tsl2x7x_write_raw, .write_raw = &tsl2x7x_write_raw,
.read_event_value = &tsl2x7x_read_thresh, .read_event_value = &tsl2x7x_read_event_value,
.write_event_value = &tsl2x7x_write_thresh, .write_event_value = &tsl2x7x_write_event_value,
.read_event_config = &tsl2x7x_read_interrupt_config, .read_event_config = &tsl2x7x_read_interrupt_config,
.write_event_config = &tsl2x7x_write_interrupt_config, .write_event_config = &tsl2x7x_write_interrupt_config,
}, },
...@@ -1625,8 +1648,8 @@ static const struct iio_info tsl2X7X_device_info[] = { ...@@ -1625,8 +1648,8 @@ static const struct iio_info tsl2X7X_device_info[] = {
.driver_module = THIS_MODULE, .driver_module = THIS_MODULE,
.read_raw = &tsl2x7x_read_raw, .read_raw = &tsl2x7x_read_raw,
.write_raw = &tsl2x7x_write_raw, .write_raw = &tsl2x7x_write_raw,
.read_event_value = &tsl2x7x_read_thresh, .read_event_value = &tsl2x7x_read_event_value,
.write_event_value = &tsl2x7x_write_thresh, .write_event_value = &tsl2x7x_write_event_value,
.read_event_config = &tsl2x7x_read_interrupt_config, .read_event_config = &tsl2x7x_read_interrupt_config,
.write_event_config = &tsl2x7x_write_interrupt_config, .write_event_config = &tsl2x7x_write_interrupt_config,
}, },
...@@ -1636,8 +1659,8 @@ static const struct iio_info tsl2X7X_device_info[] = { ...@@ -1636,8 +1659,8 @@ static const struct iio_info tsl2X7X_device_info[] = {
.driver_module = THIS_MODULE, .driver_module = THIS_MODULE,
.read_raw = &tsl2x7x_read_raw, .read_raw = &tsl2x7x_read_raw,
.write_raw = &tsl2x7x_write_raw, .write_raw = &tsl2x7x_write_raw,
.read_event_value = &tsl2x7x_read_thresh, .read_event_value = &tsl2x7x_read_event_value,
.write_event_value = &tsl2x7x_write_thresh, .write_event_value = &tsl2x7x_write_event_value,
.read_event_config = &tsl2x7x_read_interrupt_config, .read_event_config = &tsl2x7x_read_interrupt_config,
.write_event_config = &tsl2x7x_write_interrupt_config, .write_event_config = &tsl2x7x_write_interrupt_config,
}, },
...@@ -1647,8 +1670,8 @@ static const struct iio_info tsl2X7X_device_info[] = { ...@@ -1647,8 +1670,8 @@ static const struct iio_info tsl2X7X_device_info[] = {
.driver_module = THIS_MODULE, .driver_module = THIS_MODULE,
.read_raw = &tsl2x7x_read_raw, .read_raw = &tsl2x7x_read_raw,
.write_raw = &tsl2x7x_write_raw, .write_raw = &tsl2x7x_write_raw,
.read_event_value = &tsl2x7x_read_thresh, .read_event_value = &tsl2x7x_read_event_value,
.write_event_value = &tsl2x7x_write_thresh, .write_event_value = &tsl2x7x_write_event_value,
.read_event_config = &tsl2x7x_read_interrupt_config, .read_event_config = &tsl2x7x_read_interrupt_config,
.write_event_config = &tsl2x7x_write_interrupt_config, .write_event_config = &tsl2x7x_write_interrupt_config,
}, },
...@@ -1658,8 +1681,8 @@ static const struct iio_info tsl2X7X_device_info[] = { ...@@ -1658,8 +1681,8 @@ static const struct iio_info tsl2X7X_device_info[] = {
.driver_module = THIS_MODULE, .driver_module = THIS_MODULE,
.read_raw = &tsl2x7x_read_raw, .read_raw = &tsl2x7x_read_raw,
.write_raw = &tsl2x7x_write_raw, .write_raw = &tsl2x7x_write_raw,
.read_event_value = &tsl2x7x_read_thresh, .read_event_value = &tsl2x7x_read_event_value,
.write_event_value = &tsl2x7x_write_thresh, .write_event_value = &tsl2x7x_write_event_value,
.read_event_config = &tsl2x7x_read_interrupt_config, .read_event_config = &tsl2x7x_read_interrupt_config,
.write_event_config = &tsl2x7x_write_interrupt_config, .write_event_config = &tsl2x7x_write_interrupt_config,
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7