iio: Remove timestamp argument from iio_trigger_poll() and iio_trigger_poll_chained()

argument has been ignored; adjust drivers accordingly

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

diff --git a/drivers/iio/adc/ad_sigma_delta.c b/drivers/iio/adc/ad_sigma_delta.c
index 9a4e0e32a771c392dc153c19f9215ba7c3433d44..c55b81f7f9702b6955b7f01a31e24b3ade3d47fa 100644 (file)
--- a/drivers/iio/adc/ad_sigma_delta.c
+++ b/drivers/iio/adc/ad_sigma_delta.c
@@ -410,7 +410,7 @@ static irqreturn_t ad_sd_data_rdy_trig_poll(int irq, void *private)
        complete(&sigma_delta->completion);
        disable_irq_nosync(irq);
        sigma_delta->irq_dis = true;
-       iio_trigger_poll(sigma_delta->trig, iio_get_time_ns());
+       iio_trigger_poll(sigma_delta->trig);
 
        return IRQ_HANDLED;
 }

diff --git a/drivers/iio/adc/at91_adc.c b/drivers/iio/adc/at91_adc.c
index 89777ed9abd858773b128c3a4d9fd6b34bdd9584..b9592010511e137c906999d26feca113ff576d69 100644 (file)
--- a/drivers/iio/adc/at91_adc.c
+++ b/drivers/iio/adc/at91_adc.c
@@ -149,7 +149,7 @@ void handle_adc_eoc_trigger(int irq, struct iio_dev *idev)
 
        if (iio_buffer_enabled(idev)) {
                disable_irq_nosync(irq);
-               iio_trigger_poll(idev->trig, iio_get_time_ns());
+               iio_trigger_poll(idev->trig);
        } else {
                st->last_value = at91_adc_readl(st, AT91_ADC_LCDR);
                st->done = true;

diff --git a/drivers/iio/adc/xilinx-xadc-core.c b/drivers/iio/adc/xilinx-xadc-core.c
index ab52be29141bb285b2a96d7bf970e420ddb08a57..fd2745c629436f6fa51c15a851c6b7ace8d14400 100644 (file)
--- a/drivers/iio/adc/xilinx-xadc-core.c
+++ b/drivers/iio/adc/xilinx-xadc-core.c
@@ -486,7 +486,7 @@ static irqreturn_t xadc_axi_interrupt_handler(int irq, void *devid)
                return IRQ_NONE;
 
        if ((status & XADC_AXI_INT_EOS) && xadc->trigger)
-               iio_trigger_poll(xadc->trigger, 0);
+               iio_trigger_poll(xadc->trigger);
 
        if (status & XADC_AXI_INT_ALARM_MASK) {
                /*

diff --git a/drivers/iio/industrialio-trigger.c b/drivers/iio/industrialio-trigger.c
index 3383b025f62e50b1d641da288075d219e7701f22..d31098e0c43f484e5a0583ae7a44e4721e7a4608 100644 (file)
--- a/drivers/iio/industrialio-trigger.c
+++ b/drivers/iio/industrialio-trigger.c
@@ -114,7 +114,7 @@ static struct iio_trigger *iio_trigger_find_by_name(const char *name,
        return trig;
 }
 
-void iio_trigger_poll(struct iio_trigger *trig, s64 time)
+void iio_trigger_poll(struct iio_trigger *trig)
 {
        int i;
 
@@ -133,12 +133,12 @@ EXPORT_SYMBOL(iio_trigger_poll);
 
 irqreturn_t iio_trigger_generic_data_rdy_poll(int irq, void *private)
 {
-       iio_trigger_poll(private, iio_get_time_ns());
+       iio_trigger_poll(private);
        return IRQ_HANDLED;
 }
 EXPORT_SYMBOL(iio_trigger_generic_data_rdy_poll);
 
-void iio_trigger_poll_chained(struct iio_trigger *trig, s64 time)
+void iio_trigger_poll_chained(struct iio_trigger *trig)
 {
        int i;
 
@@ -161,7 +161,7 @@ void iio_trigger_notify_done(struct iio_trigger *trig)
                trig->ops->try_reenable)
                if (trig->ops->try_reenable(trig))
                        /* Missed an interrupt so launch new poll now */
-                       iio_trigger_poll(trig, 0);
+                       iio_trigger_poll(trig);
 }
 EXPORT_SYMBOL(iio_trigger_notify_done);
 

diff --git a/drivers/iio/light/gp2ap020a00f.c b/drivers/iio/light/gp2ap020a00f.c
index 04bdb85d2d9f33a353bd5b88a92f39cb9973fe75..221ed16de1f7babd220c81296c5eef7fdb959a0d 100644 (file)
--- a/drivers/iio/light/gp2ap020a00f.c
+++ b/drivers/iio/light/gp2ap020a00f.c
@@ -827,7 +827,7 @@ static void gp2ap020a00f_iio_trigger_work(struct irq_work *work)
        struct gp2ap020a00f_data *data =
                container_of(work, struct gp2ap020a00f_data, work);
 
-       iio_trigger_poll(data->trig, 0);
+       iio_trigger_poll(data->trig);
 }
 
 static irqreturn_t gp2ap020a00f_prox_sensing_handler(int irq, void *data)

diff --git a/drivers/iio/proximity/as3935.c b/drivers/iio/proximity/as3935.c
index bf677bfe8eb2c5d647195d1edff82d4108110ae6..5e780ef206f3c48774cb3f2d3a587ba0c6be1571 100644 (file)
--- a/drivers/iio/proximity/as3935.c
+++ b/drivers/iio/proximity/as3935.c
@@ -232,7 +232,7 @@ static void as3935_event_work(struct work_struct *work)
 
        switch (val) {
        case AS3935_EVENT_INT:
-               iio_trigger_poll(st->trig, iio_get_time_ns());
+               iio_trigger_poll(st->trig);
                break;
        case AS3935_NOISE_INT:
                dev_warn(&st->spi->dev, "noise level is too high");

diff --git a/drivers/iio/trigger/iio-trig-interrupt.c b/drivers/iio/trigger/iio-trig-interrupt.c
index 02577ec54c6b1ed650afa196a49dea3373569787..7a149a7822bcd9bf6aad40fd82aec99642ae0430 100644 (file)
--- a/drivers/iio/trigger/iio-trig-interrupt.c
+++ b/drivers/iio/trigger/iio-trig-interrupt.c
@@ -24,8 +24,7 @@ struct iio_interrupt_trigger_info {
 
 static irqreturn_t iio_interrupt_trigger_poll(int irq, void *private)
 {
-       /* Timestamp not currently provided */
-       iio_trigger_poll(private, 0);
+       iio_trigger_poll(private);
        return IRQ_HANDLED;
 }
 

diff --git a/drivers/iio/trigger/iio-trig-sysfs.c b/drivers/iio/trigger/iio-trig-sysfs.c
index 15e3b850f513e9158318bf5ff3ae420cf8a14500..254c7e906127f6152a51d273e57b0a5daa0fa950 100644 (file)
--- a/drivers/iio/trigger/iio-trig-sysfs.c
+++ b/drivers/iio/trigger/iio-trig-sysfs.c
@@ -96,7 +96,7 @@ static void iio_sysfs_trigger_work(struct irq_work *work)
        struct iio_sysfs_trig *trig = container_of(work, struct iio_sysfs_trig,
                                                        work);
 
-       iio_trigger_poll(trig->trig, 0);
+       iio_trigger_poll(trig->trig);
 }
 
 static ssize_t iio_sysfs_trigger_poll(struct device *dev,

diff --git a/drivers/staging/iio/accel/lis3l02dq_ring.c b/drivers/staging/iio/accel/lis3l02dq_ring.c
index 79cefe0a516a7316269546a36c2eec1fb3648556..bf33fdead479e6aa5430a2ecc5a2ab953bf2077c 100644 (file)
--- a/drivers/staging/iio/accel/lis3l02dq_ring.c
+++ b/drivers/staging/iio/accel/lis3l02dq_ring.c
@@ -31,7 +31,7 @@ irqreturn_t lis3l02dq_data_rdy_trig_poll(int irq, void *private)
        struct lis3l02dq_state *st = iio_priv(indio_dev);
 
        if (st->trigger_on) {
-               iio_trigger_poll(st->trig, iio_get_time_ns());
+               iio_trigger_poll(st->trig);
                return IRQ_HANDLED;
        } else
                return IRQ_WAKE_THREAD;

diff --git a/drivers/staging/iio/adc/mxs-lradc.c b/drivers/staging/iio/adc/mxs-lradc.c
index dae8d1a9038e661885e2c3bf51869ba76121d122..d8619993c6ffbaba1feceb46a0d2381fd76e36de 100644 (file)
--- a/drivers/staging/iio/adc/mxs-lradc.c
+++ b/drivers/staging/iio/adc/mxs-lradc.c
@@ -1166,7 +1166,7 @@ static irqreturn_t mxs_lradc_handle_irq(int irq, void *data)
                mxs_lradc_handle_touch(lradc);
 
        if (iio_buffer_enabled(iio))
-               iio_trigger_poll(iio->trig, iio_get_time_ns());
+               iio_trigger_poll(iio->trig);
        else if (reg & LRADC_CTRL1_LRADC_IRQ(0))
                complete(&lradc->completion);
 

diff --git a/drivers/staging/iio/meter/ade7758_trigger.c b/drivers/staging/iio/meter/ade7758_trigger.c
index 7a94ddd42f593e7bc1355cd06ebfcb6c400ff014..ea01b8f7a2c31d6ecbddc90637f99477be5df1f3 100644 (file)
--- a/drivers/staging/iio/meter/ade7758_trigger.c
+++ b/drivers/staging/iio/meter/ade7758_trigger.c
@@ -21,7 +21,7 @@
 static irqreturn_t ade7758_data_rdy_trig_poll(int irq, void *private)
 {
        disable_irq_nosync(irq);
-       iio_trigger_poll(private, iio_get_time_ns());
+       iio_trigger_poll(private);
 
        return IRQ_HANDLED;
 }

diff --git a/drivers/staging/iio/trigger/iio-trig-bfin-timer.c b/drivers/staging/iio/trigger/iio-trig-bfin-timer.c
index 26e1ca0b7800223b88f3102d562d0c7c084087bb..16f1a06bcd89afed9245c40bc06cab7435235634 100644 (file)
--- a/drivers/staging/iio/trigger/iio-trig-bfin-timer.c
+++ b/drivers/staging/iio/trigger/iio-trig-bfin-timer.c
@@ -154,7 +154,7 @@ static irqreturn_t iio_bfin_tmr_trigger_isr(int irq, void *devid)
        struct bfin_tmr_state *st = devid;
 
        clear_gptimer_intr(st->t->id);
-       iio_trigger_poll(st->trig, 0);
+       iio_trigger_poll(st->trig);
 
        return IRQ_HANDLED;
 }

diff --git a/drivers/staging/iio/trigger/iio-trig-periodic-rtc.c b/drivers/staging/iio/trigger/iio-trig-periodic-rtc.c
index b5108a163e378725c7b3b6b3b92274cb38218ae2..b1aeb88273c9b5f9ee952ffae357d20c8d7f2577 100644 (file)
--- a/drivers/staging/iio/trigger/iio-trig-periodic-rtc.c
+++ b/drivers/staging/iio/trigger/iio-trig-periodic-rtc.c
@@ -106,8 +106,7 @@ static const struct attribute_group *iio_trig_prtc_attr_groups[] = {
 
 static void iio_prtc_trigger_poll(void *private_data)
 {
-       /* Timestamp is not provided currently */
-       iio_trigger_poll(private_data, 0);
+       iio_trigger_poll(private_data);
 }
 
 static const struct iio_trigger_ops iio_prtc_trigger_ops = {

diff --git a/include/linux/iio/trigger.h b/include/linux/iio/trigger.h
index 369cf2cd51448b690cb812e6310cbd450ab83386..4b79ffe7b18868a65e95849ad128e5f096760cb7 100644 (file)
--- a/include/linux/iio/trigger.h
+++ b/include/linux/iio/trigger.h
@@ -129,12 +129,11 @@ void iio_trigger_unregister(struct iio_trigger *trig_info);
 /**
  * iio_trigger_poll() - called on a trigger occurring
  * @trig:      trigger which occurred
- * @time:      timestamp when trigger occurred
  *
  * Typically called in relevant hardware interrupt handler.
  **/
-void iio_trigger_poll(struct iio_trigger *trig, s64 time);
-void iio_trigger_poll_chained(struct iio_trigger *trig, s64 time);
+void iio_trigger_poll(struct iio_trigger *trig);
+void iio_trigger_poll_chained(struct iio_trigger *trig);
 
 irqreturn_t iio_trigger_generic_data_rdy_poll(int irq, void *private);