diff options
author | Peter Meerwald <pmeerw@pmeerw.net> | 2014-12-06 01:46:00 -0500 |
---|---|---|
committer | Jonathan Cameron <jic23@kernel.org> | 2014-06-14 11:25:59 -0400 |
commit | 398fd22b6b94cb15c1c299bceecd63644a1b17b4 (patch) | |
tree | fe941bcc754089e09a7c7a16069c54882b51f58e /drivers | |
parent | aff8945566f0352b39244a714769b10f9f4d873a (diff) |
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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/iio/adc/ad_sigma_delta.c | 2 | ||||
-rw-r--r-- | drivers/iio/adc/at91_adc.c | 2 | ||||
-rw-r--r-- | drivers/iio/adc/xilinx-xadc-core.c | 2 | ||||
-rw-r--r-- | drivers/iio/industrialio-trigger.c | 8 | ||||
-rw-r--r-- | drivers/iio/light/gp2ap020a00f.c | 2 | ||||
-rw-r--r-- | drivers/iio/proximity/as3935.c | 2 | ||||
-rw-r--r-- | drivers/iio/trigger/iio-trig-interrupt.c | 3 | ||||
-rw-r--r-- | drivers/iio/trigger/iio-trig-sysfs.c | 2 | ||||
-rw-r--r-- | drivers/staging/iio/accel/lis3l02dq_ring.c | 2 | ||||
-rw-r--r-- | drivers/staging/iio/adc/mxs-lradc.c | 2 | ||||
-rw-r--r-- | drivers/staging/iio/meter/ade7758_trigger.c | 2 | ||||
-rw-r--r-- | drivers/staging/iio/trigger/iio-trig-bfin-timer.c | 2 | ||||
-rw-r--r-- | drivers/staging/iio/trigger/iio-trig-periodic-rtc.c | 3 |
13 files changed, 16 insertions, 18 deletions
diff --git a/drivers/iio/adc/ad_sigma_delta.c b/drivers/iio/adc/ad_sigma_delta.c index 9a4e0e32a771..c55b81f7f970 100644 --- 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) | |||
410 | complete(&sigma_delta->completion); | 410 | complete(&sigma_delta->completion); |
411 | disable_irq_nosync(irq); | 411 | disable_irq_nosync(irq); |
412 | sigma_delta->irq_dis = true; | 412 | sigma_delta->irq_dis = true; |
413 | iio_trigger_poll(sigma_delta->trig, iio_get_time_ns()); | 413 | iio_trigger_poll(sigma_delta->trig); |
414 | 414 | ||
415 | return IRQ_HANDLED; | 415 | return IRQ_HANDLED; |
416 | } | 416 | } |
diff --git a/drivers/iio/adc/at91_adc.c b/drivers/iio/adc/at91_adc.c index 89777ed9abd8..b9592010511e 100644 --- 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) | |||
149 | 149 | ||
150 | if (iio_buffer_enabled(idev)) { | 150 | if (iio_buffer_enabled(idev)) { |
151 | disable_irq_nosync(irq); | 151 | disable_irq_nosync(irq); |
152 | iio_trigger_poll(idev->trig, iio_get_time_ns()); | 152 | iio_trigger_poll(idev->trig); |
153 | } else { | 153 | } else { |
154 | st->last_value = at91_adc_readl(st, AT91_ADC_LCDR); | 154 | st->last_value = at91_adc_readl(st, AT91_ADC_LCDR); |
155 | st->done = true; | 155 | st->done = true; |
diff --git a/drivers/iio/adc/xilinx-xadc-core.c b/drivers/iio/adc/xilinx-xadc-core.c index ab52be29141b..fd2745c62943 100644 --- 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) | |||
486 | return IRQ_NONE; | 486 | return IRQ_NONE; |
487 | 487 | ||
488 | if ((status & XADC_AXI_INT_EOS) && xadc->trigger) | 488 | if ((status & XADC_AXI_INT_EOS) && xadc->trigger) |
489 | iio_trigger_poll(xadc->trigger, 0); | 489 | iio_trigger_poll(xadc->trigger); |
490 | 490 | ||
491 | if (status & XADC_AXI_INT_ALARM_MASK) { | 491 | if (status & XADC_AXI_INT_ALARM_MASK) { |
492 | /* | 492 | /* |
diff --git a/drivers/iio/industrialio-trigger.c b/drivers/iio/industrialio-trigger.c index 3383b025f62e..d31098e0c43f 100644 --- 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, | |||
114 | return trig; | 114 | return trig; |
115 | } | 115 | } |
116 | 116 | ||
117 | void iio_trigger_poll(struct iio_trigger *trig, s64 time) | 117 | void iio_trigger_poll(struct iio_trigger *trig) |
118 | { | 118 | { |
119 | int i; | 119 | int i; |
120 | 120 | ||
@@ -133,12 +133,12 @@ EXPORT_SYMBOL(iio_trigger_poll); | |||
133 | 133 | ||
134 | irqreturn_t iio_trigger_generic_data_rdy_poll(int irq, void *private) | 134 | irqreturn_t iio_trigger_generic_data_rdy_poll(int irq, void *private) |
135 | { | 135 | { |
136 | iio_trigger_poll(private, iio_get_time_ns()); | 136 | iio_trigger_poll(private); |
137 | return IRQ_HANDLED; | 137 | return IRQ_HANDLED; |
138 | } | 138 | } |
139 | EXPORT_SYMBOL(iio_trigger_generic_data_rdy_poll); | 139 | EXPORT_SYMBOL(iio_trigger_generic_data_rdy_poll); |
140 | 140 | ||
141 | void iio_trigger_poll_chained(struct iio_trigger *trig, s64 time) | 141 | void iio_trigger_poll_chained(struct iio_trigger *trig) |
142 | { | 142 | { |
143 | int i; | 143 | int i; |
144 | 144 | ||
@@ -161,7 +161,7 @@ void iio_trigger_notify_done(struct iio_trigger *trig) | |||
161 | trig->ops->try_reenable) | 161 | trig->ops->try_reenable) |
162 | if (trig->ops->try_reenable(trig)) | 162 | if (trig->ops->try_reenable(trig)) |
163 | /* Missed an interrupt so launch new poll now */ | 163 | /* Missed an interrupt so launch new poll now */ |
164 | iio_trigger_poll(trig, 0); | 164 | iio_trigger_poll(trig); |
165 | } | 165 | } |
166 | EXPORT_SYMBOL(iio_trigger_notify_done); | 166 | EXPORT_SYMBOL(iio_trigger_notify_done); |
167 | 167 | ||
diff --git a/drivers/iio/light/gp2ap020a00f.c b/drivers/iio/light/gp2ap020a00f.c index 04bdb85d2d9f..221ed16de1f7 100644 --- 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) | |||
827 | struct gp2ap020a00f_data *data = | 827 | struct gp2ap020a00f_data *data = |
828 | container_of(work, struct gp2ap020a00f_data, work); | 828 | container_of(work, struct gp2ap020a00f_data, work); |
829 | 829 | ||
830 | iio_trigger_poll(data->trig, 0); | 830 | iio_trigger_poll(data->trig); |
831 | } | 831 | } |
832 | 832 | ||
833 | static irqreturn_t gp2ap020a00f_prox_sensing_handler(int irq, void *data) | 833 | 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 bf677bfe8eb2..5e780ef206f3 100644 --- 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) | |||
232 | 232 | ||
233 | switch (val) { | 233 | switch (val) { |
234 | case AS3935_EVENT_INT: | 234 | case AS3935_EVENT_INT: |
235 | iio_trigger_poll(st->trig, iio_get_time_ns()); | 235 | iio_trigger_poll(st->trig); |
236 | break; | 236 | break; |
237 | case AS3935_NOISE_INT: | 237 | case AS3935_NOISE_INT: |
238 | dev_warn(&st->spi->dev, "noise level is too high"); | 238 | 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 02577ec54c6b..7a149a7822bc 100644 --- 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 { | |||
24 | 24 | ||
25 | static irqreturn_t iio_interrupt_trigger_poll(int irq, void *private) | 25 | static irqreturn_t iio_interrupt_trigger_poll(int irq, void *private) |
26 | { | 26 | { |
27 | /* Timestamp not currently provided */ | 27 | iio_trigger_poll(private); |
28 | iio_trigger_poll(private, 0); | ||
29 | return IRQ_HANDLED; | 28 | return IRQ_HANDLED; |
30 | } | 29 | } |
31 | 30 | ||
diff --git a/drivers/iio/trigger/iio-trig-sysfs.c b/drivers/iio/trigger/iio-trig-sysfs.c index 15e3b850f513..254c7e906127 100644 --- 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) | |||
96 | struct iio_sysfs_trig *trig = container_of(work, struct iio_sysfs_trig, | 96 | struct iio_sysfs_trig *trig = container_of(work, struct iio_sysfs_trig, |
97 | work); | 97 | work); |
98 | 98 | ||
99 | iio_trigger_poll(trig->trig, 0); | 99 | iio_trigger_poll(trig->trig); |
100 | } | 100 | } |
101 | 101 | ||
102 | static ssize_t iio_sysfs_trigger_poll(struct device *dev, | 102 | 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 79cefe0a516a..bf33fdead479 100644 --- 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) | |||
31 | struct lis3l02dq_state *st = iio_priv(indio_dev); | 31 | struct lis3l02dq_state *st = iio_priv(indio_dev); |
32 | 32 | ||
33 | if (st->trigger_on) { | 33 | if (st->trigger_on) { |
34 | iio_trigger_poll(st->trig, iio_get_time_ns()); | 34 | iio_trigger_poll(st->trig); |
35 | return IRQ_HANDLED; | 35 | return IRQ_HANDLED; |
36 | } else | 36 | } else |
37 | return IRQ_WAKE_THREAD; | 37 | return IRQ_WAKE_THREAD; |
diff --git a/drivers/staging/iio/adc/mxs-lradc.c b/drivers/staging/iio/adc/mxs-lradc.c index dae8d1a9038e..d8619993c6ff 100644 --- 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) | |||
1166 | mxs_lradc_handle_touch(lradc); | 1166 | mxs_lradc_handle_touch(lradc); |
1167 | 1167 | ||
1168 | if (iio_buffer_enabled(iio)) | 1168 | if (iio_buffer_enabled(iio)) |
1169 | iio_trigger_poll(iio->trig, iio_get_time_ns()); | 1169 | iio_trigger_poll(iio->trig); |
1170 | else if (reg & LRADC_CTRL1_LRADC_IRQ(0)) | 1170 | else if (reg & LRADC_CTRL1_LRADC_IRQ(0)) |
1171 | complete(&lradc->completion); | 1171 | complete(&lradc->completion); |
1172 | 1172 | ||
diff --git a/drivers/staging/iio/meter/ade7758_trigger.c b/drivers/staging/iio/meter/ade7758_trigger.c index 7a94ddd42f59..ea01b8f7a2c3 100644 --- a/drivers/staging/iio/meter/ade7758_trigger.c +++ b/drivers/staging/iio/meter/ade7758_trigger.c | |||
@@ -21,7 +21,7 @@ | |||
21 | static irqreturn_t ade7758_data_rdy_trig_poll(int irq, void *private) | 21 | static irqreturn_t ade7758_data_rdy_trig_poll(int irq, void *private) |
22 | { | 22 | { |
23 | disable_irq_nosync(irq); | 23 | disable_irq_nosync(irq); |
24 | iio_trigger_poll(private, iio_get_time_ns()); | 24 | iio_trigger_poll(private); |
25 | 25 | ||
26 | return IRQ_HANDLED; | 26 | return IRQ_HANDLED; |
27 | } | 27 | } |
diff --git a/drivers/staging/iio/trigger/iio-trig-bfin-timer.c b/drivers/staging/iio/trigger/iio-trig-bfin-timer.c index 26e1ca0b7800..16f1a06bcd89 100644 --- 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) | |||
154 | struct bfin_tmr_state *st = devid; | 154 | struct bfin_tmr_state *st = devid; |
155 | 155 | ||
156 | clear_gptimer_intr(st->t->id); | 156 | clear_gptimer_intr(st->t->id); |
157 | iio_trigger_poll(st->trig, 0); | 157 | iio_trigger_poll(st->trig); |
158 | 158 | ||
159 | return IRQ_HANDLED; | 159 | return IRQ_HANDLED; |
160 | } | 160 | } |
diff --git a/drivers/staging/iio/trigger/iio-trig-periodic-rtc.c b/drivers/staging/iio/trigger/iio-trig-periodic-rtc.c index b5108a163e37..b1aeb88273c9 100644 --- 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[] = { | |||
106 | 106 | ||
107 | static void iio_prtc_trigger_poll(void *private_data) | 107 | static void iio_prtc_trigger_poll(void *private_data) |
108 | { | 108 | { |
109 | /* Timestamp is not provided currently */ | 109 | iio_trigger_poll(private_data); |
110 | iio_trigger_poll(private_data, 0); | ||
111 | } | 110 | } |
112 | 111 | ||
113 | static const struct iio_trigger_ops iio_prtc_trigger_ops = { | 112 | static const struct iio_trigger_ops iio_prtc_trigger_ops = { |