Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Peter Meerwald and committed by
Jonathan Cameron
398fd22b aff89455

+18 -21
+1 -1
drivers/iio/adc/ad_sigma_delta.c
··· 410 410 complete(&sigma_delta->completion); 411 411 disable_irq_nosync(irq); 412 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 415 return IRQ_HANDLED; 416 416 }
+1 -1
drivers/iio/adc/at91_adc.c
··· 149 149 150 150 if (iio_buffer_enabled(idev)) { 151 151 disable_irq_nosync(irq); 152 - iio_trigger_poll(idev->trig, iio_get_time_ns()); 152 + iio_trigger_poll(idev->trig); 153 153 } else { 154 154 st->last_value = at91_adc_readl(st, AT91_ADC_LCDR); 155 155 st->done = true;
+1 -1
drivers/iio/adc/xilinx-xadc-core.c
··· 486 486 return IRQ_NONE; 487 487 488 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 491 if (status & XADC_AXI_INT_ALARM_MASK) { 492 492 /*
+4 -4
drivers/iio/industrialio-trigger.c
··· 114 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 119 int i; 120 120 ··· 133 133 134 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 137 return IRQ_HANDLED; 138 138 } 139 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 143 int i; 144 144 ··· 161 161 trig->ops->try_reenable) 162 162 if (trig->ops->try_reenable(trig)) 163 163 /* Missed an interrupt so launch new poll now */ 164 - iio_trigger_poll(trig, 0); 164 + iio_trigger_poll(trig); 165 165 } 166 166 EXPORT_SYMBOL(iio_trigger_notify_done); 167 167
+1 -1
drivers/iio/light/gp2ap020a00f.c
··· 827 827 struct gp2ap020a00f_data *data = 828 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 833 static irqreturn_t gp2ap020a00f_prox_sensing_handler(int irq, void *data)
+1 -1
drivers/iio/proximity/as3935.c
··· 232 232 233 233 switch (val) { 234 234 case AS3935_EVENT_INT: 235 - iio_trigger_poll(st->trig, iio_get_time_ns()); 235 + iio_trigger_poll(st->trig); 236 236 break; 237 237 case AS3935_NOISE_INT: 238 238 dev_warn(&st->spi->dev, "noise level is too high");
+1 -2
drivers/iio/trigger/iio-trig-interrupt.c
··· 24 24 25 25 static irqreturn_t iio_interrupt_trigger_poll(int irq, void *private) 26 26 { 27 - /* Timestamp not currently provided */ 28 - iio_trigger_poll(private, 0); 27 + iio_trigger_poll(private); 29 28 return IRQ_HANDLED; 30 29 } 31 30
+1 -1
drivers/iio/trigger/iio-trig-sysfs.c
··· 96 96 struct iio_sysfs_trig *trig = container_of(work, struct iio_sysfs_trig, 97 97 work); 98 98 99 - iio_trigger_poll(trig->trig, 0); 99 + iio_trigger_poll(trig->trig); 100 100 } 101 101 102 102 static ssize_t iio_sysfs_trigger_poll(struct device *dev,
+1 -1
drivers/staging/iio/accel/lis3l02dq_ring.c
··· 31 31 struct lis3l02dq_state *st = iio_priv(indio_dev); 32 32 33 33 if (st->trigger_on) { 34 - iio_trigger_poll(st->trig, iio_get_time_ns()); 34 + iio_trigger_poll(st->trig); 35 35 return IRQ_HANDLED; 36 36 } else 37 37 return IRQ_WAKE_THREAD;
+1 -1
drivers/staging/iio/adc/mxs-lradc.c
··· 1166 1166 mxs_lradc_handle_touch(lradc); 1167 1167 1168 1168 if (iio_buffer_enabled(iio)) 1169 - iio_trigger_poll(iio->trig, iio_get_time_ns()); 1169 + iio_trigger_poll(iio->trig); 1170 1170 else if (reg & LRADC_CTRL1_LRADC_IRQ(0)) 1171 1171 complete(&lradc->completion); 1172 1172
+1 -1
drivers/staging/iio/meter/ade7758_trigger.c
··· 21 21 static irqreturn_t ade7758_data_rdy_trig_poll(int irq, void *private) 22 22 { 23 23 disable_irq_nosync(irq); 24 - iio_trigger_poll(private, iio_get_time_ns()); 24 + iio_trigger_poll(private); 25 25 26 26 return IRQ_HANDLED; 27 27 }
+1 -1
drivers/staging/iio/trigger/iio-trig-bfin-timer.c
··· 154 154 struct bfin_tmr_state *st = devid; 155 155 156 156 clear_gptimer_intr(st->t->id); 157 - iio_trigger_poll(st->trig, 0); 157 + iio_trigger_poll(st->trig); 158 158 159 159 return IRQ_HANDLED; 160 160 }
+1 -2
drivers/staging/iio/trigger/iio-trig-periodic-rtc.c
··· 106 106 107 107 static void iio_prtc_trigger_poll(void *private_data) 108 108 { 109 - /* Timestamp is not provided currently */ 110 - iio_trigger_poll(private_data, 0); 109 + iio_trigger_poll(private_data); 111 110 } 112 111 113 112 static const struct iio_trigger_ops iio_prtc_trigger_ops = {
+2 -3
include/linux/iio/trigger.h
··· 129 129 /** 130 130 * iio_trigger_poll() - called on a trigger occurring 131 131 * @trig: trigger which occurred 132 - * @time: timestamp when trigger occurred 133 132 * 134 133 * Typically called in relevant hardware interrupt handler. 135 134 **/ 136 - void iio_trigger_poll(struct iio_trigger *trig, s64 time); 137 - void iio_trigger_poll_chained(struct iio_trigger *trig, s64 time); 135 + void iio_trigger_poll(struct iio_trigger *trig); 136 + void iio_trigger_poll_chained(struct iio_trigger *trig); 138 137 139 138 irqreturn_t iio_trigger_generic_data_rdy_poll(int irq, void *private); 140 139