staging: iio: tsl2x7x: remove unnecessary code
authorBrian Masney <masneyb@onstation.org>
Wed, 21 Mar 2018 10:29:02 +0000 (06:29 -0400)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Sat, 24 Mar 2018 13:31:40 +0000 (13:31 +0000)
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>
drivers/staging/iio/light/tsl2x7x.c

index 82681300e1062b96d4c413095f16060de37c1756..82cf9d853b18056c3e6f74e7bde8f3c2d11fe724 100644 (file)
@@ -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);