diff options
| author | Brian Masney <masneyb@onstation.org> | 2018-03-21 11:29:02 +0100 |
|---|---|---|
| committer | Jonathan Cameron <Jonathan.Cameron@huawei.com> | 2018-03-24 14:31:40 +0100 |
| commit | c7bd25e8e23c934d8ad420ea93a508edf1588905 (patch) | |
| tree | 91b680b6702e70f236e5d141b42c6003fd08b805 | |
| parent | staging:iio:ade7854: Remove read_reg_* duplications (diff) | |
| download | linux-c7bd25e8e23c934d8ad420ea93a508edf1588905.tar.xz linux-c7bd25e8e23c934d8ad420ea93a508edf1588905.zip | |
staging: iio: tsl2x7x: remove unnecessary code
As a follow up to the work in commit a0722d05a195 ("staging: iio:
tsl2x7x: convert mutex_trylock() to mutex_lock()"), this patch removes
the unnecessary calls to tsl2x7x_get_prox() and tsl2x7x_get_lux() in
tsl2x7x_event_handler(). Previously, these functions were locked with
mutex_trylock(), but that is no longer the case. This patch also removes
a comment that is no longer relevant about returning the last sample.
Signed-off-by: Brian Masney <masneyb@onstation.org>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
| -rw-r--r-- | drivers/staging/iio/light/tsl2x7x.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/staging/iio/light/tsl2x7x.c b/drivers/staging/iio/light/tsl2x7x.c index 82681300e106..82cf9d853b18 100644 --- a/drivers/staging/iio/light/tsl2x7x.c +++ b/drivers/staging/iio/light/tsl2x7x.c @@ -1430,7 +1430,6 @@ static irqreturn_t tsl2x7x_event_handler(int irq, void *private) /* What type of interrupt do we need to process */ if (ret & TSL2X7X_STA_PRX_INTR) { - tsl2x7x_get_prox(indio_dev); /* freshen data for ABI */ iio_push_event(indio_dev, IIO_UNMOD_EVENT_CODE(IIO_PROXIMITY, 0, @@ -1440,7 +1439,6 @@ static irqreturn_t tsl2x7x_event_handler(int irq, void *private) } if (ret & TSL2X7X_STA_ALS_INTR) { - tsl2x7x_get_lux(indio_dev); /* freshen data for ABI */ iio_push_event(indio_dev, IIO_UNMOD_EVENT_CODE(IIO_LIGHT, 0, @@ -1745,10 +1743,6 @@ static int tsl2x7x_probe(struct i2c_client *clientp, return ret; } - /* - * ALS and PROX functions can be invoked via user space poll - * or H/W interrupt. If busy return last sample. - */ mutex_init(&chip->als_mutex); mutex_init(&chip->prox_mutex); |