提交 398fd22b 编写于 作者: P Peter Meerwald 提交者: Jonathan Cameron

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

argument has been ignored; adjust drivers accordingly
Signed-off-by: NPeter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: NJonathan Cameron <jic23@kernel.org>
上级 aff89455
...@@ -410,7 +410,7 @@ static irqreturn_t ad_sd_data_rdy_trig_poll(int irq, void *private) ...@@ -410,7 +410,7 @@ static irqreturn_t ad_sd_data_rdy_trig_poll(int irq, void *private)
complete(&sigma_delta->completion); complete(&sigma_delta->completion);
disable_irq_nosync(irq); disable_irq_nosync(irq);
sigma_delta->irq_dis = true; sigma_delta->irq_dis = true;
iio_trigger_poll(sigma_delta->trig, iio_get_time_ns()); iio_trigger_poll(sigma_delta->trig);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
......
...@@ -149,7 +149,7 @@ void handle_adc_eoc_trigger(int irq, struct iio_dev *idev) ...@@ -149,7 +149,7 @@ void handle_adc_eoc_trigger(int irq, struct iio_dev *idev)
if (iio_buffer_enabled(idev)) { if (iio_buffer_enabled(idev)) {
disable_irq_nosync(irq); disable_irq_nosync(irq);
iio_trigger_poll(idev->trig, iio_get_time_ns()); iio_trigger_poll(idev->trig);
} else { } else {
st->last_value = at91_adc_readl(st, AT91_ADC_LCDR); st->last_value = at91_adc_readl(st, AT91_ADC_LCDR);
st->done = true; st->done = true;
......
...@@ -486,7 +486,7 @@ static irqreturn_t xadc_axi_interrupt_handler(int irq, void *devid) ...@@ -486,7 +486,7 @@ static irqreturn_t xadc_axi_interrupt_handler(int irq, void *devid)
return IRQ_NONE; return IRQ_NONE;
if ((status & XADC_AXI_INT_EOS) && xadc->trigger) 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) { if (status & XADC_AXI_INT_ALARM_MASK) {
/* /*
......
...@@ -114,7 +114,7 @@ static struct iio_trigger *iio_trigger_find_by_name(const char *name, ...@@ -114,7 +114,7 @@ static struct iio_trigger *iio_trigger_find_by_name(const char *name,
return trig; return trig;
} }
void iio_trigger_poll(struct iio_trigger *trig, s64 time) void iio_trigger_poll(struct iio_trigger *trig)
{ {
int i; int i;
...@@ -133,12 +133,12 @@ EXPORT_SYMBOL(iio_trigger_poll); ...@@ -133,12 +133,12 @@ EXPORT_SYMBOL(iio_trigger_poll);
irqreturn_t iio_trigger_generic_data_rdy_poll(int irq, void *private) 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; return IRQ_HANDLED;
} }
EXPORT_SYMBOL(iio_trigger_generic_data_rdy_poll); 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; int i;
...@@ -161,7 +161,7 @@ void iio_trigger_notify_done(struct iio_trigger *trig) ...@@ -161,7 +161,7 @@ void iio_trigger_notify_done(struct iio_trigger *trig)
trig->ops->try_reenable) trig->ops->try_reenable)
if (trig->ops->try_reenable(trig)) if (trig->ops->try_reenable(trig))
/* Missed an interrupt so launch new poll now */ /* Missed an interrupt so launch new poll now */
iio_trigger_poll(trig, 0); iio_trigger_poll(trig);
} }
EXPORT_SYMBOL(iio_trigger_notify_done); EXPORT_SYMBOL(iio_trigger_notify_done);
......
...@@ -827,7 +827,7 @@ static void gp2ap020a00f_iio_trigger_work(struct irq_work *work) ...@@ -827,7 +827,7 @@ static void gp2ap020a00f_iio_trigger_work(struct irq_work *work)
struct gp2ap020a00f_data *data = struct gp2ap020a00f_data *data =
container_of(work, struct gp2ap020a00f_data, work); 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) static irqreturn_t gp2ap020a00f_prox_sensing_handler(int irq, void *data)
......
...@@ -232,7 +232,7 @@ static void as3935_event_work(struct work_struct *work) ...@@ -232,7 +232,7 @@ static void as3935_event_work(struct work_struct *work)
switch (val) { switch (val) {
case AS3935_EVENT_INT: case AS3935_EVENT_INT:
iio_trigger_poll(st->trig, iio_get_time_ns()); iio_trigger_poll(st->trig);
break; break;
case AS3935_NOISE_INT: case AS3935_NOISE_INT:
dev_warn(&st->spi->dev, "noise level is too high"); dev_warn(&st->spi->dev, "noise level is too high");
......
...@@ -24,8 +24,7 @@ struct iio_interrupt_trigger_info { ...@@ -24,8 +24,7 @@ struct iio_interrupt_trigger_info {
static irqreturn_t iio_interrupt_trigger_poll(int irq, void *private) static irqreturn_t iio_interrupt_trigger_poll(int irq, void *private)
{ {
/* Timestamp not currently provided */ iio_trigger_poll(private);
iio_trigger_poll(private, 0);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
......
...@@ -96,7 +96,7 @@ static void iio_sysfs_trigger_work(struct irq_work *work) ...@@ -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, struct iio_sysfs_trig *trig = container_of(work, struct iio_sysfs_trig,
work); work);
iio_trigger_poll(trig->trig, 0); iio_trigger_poll(trig->trig);
} }
static ssize_t iio_sysfs_trigger_poll(struct device *dev, static ssize_t iio_sysfs_trigger_poll(struct device *dev,
......
...@@ -31,7 +31,7 @@ irqreturn_t lis3l02dq_data_rdy_trig_poll(int irq, void *private) ...@@ -31,7 +31,7 @@ irqreturn_t lis3l02dq_data_rdy_trig_poll(int irq, void *private)
struct lis3l02dq_state *st = iio_priv(indio_dev); struct lis3l02dq_state *st = iio_priv(indio_dev);
if (st->trigger_on) { if (st->trigger_on) {
iio_trigger_poll(st->trig, iio_get_time_ns()); iio_trigger_poll(st->trig);
return IRQ_HANDLED; return IRQ_HANDLED;
} else } else
return IRQ_WAKE_THREAD; return IRQ_WAKE_THREAD;
......
...@@ -1166,7 +1166,7 @@ static irqreturn_t mxs_lradc_handle_irq(int irq, void *data) ...@@ -1166,7 +1166,7 @@ static irqreturn_t mxs_lradc_handle_irq(int irq, void *data)
mxs_lradc_handle_touch(lradc); mxs_lradc_handle_touch(lradc);
if (iio_buffer_enabled(iio)) 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)) else if (reg & LRADC_CTRL1_LRADC_IRQ(0))
complete(&lradc->completion); complete(&lradc->completion);
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
static irqreturn_t ade7758_data_rdy_trig_poll(int irq, void *private) static irqreturn_t ade7758_data_rdy_trig_poll(int irq, void *private)
{ {
disable_irq_nosync(irq); disable_irq_nosync(irq);
iio_trigger_poll(private, iio_get_time_ns()); iio_trigger_poll(private);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
......
...@@ -154,7 +154,7 @@ static irqreturn_t iio_bfin_tmr_trigger_isr(int irq, void *devid) ...@@ -154,7 +154,7 @@ static irqreturn_t iio_bfin_tmr_trigger_isr(int irq, void *devid)
struct bfin_tmr_state *st = devid; struct bfin_tmr_state *st = devid;
clear_gptimer_intr(st->t->id); clear_gptimer_intr(st->t->id);
iio_trigger_poll(st->trig, 0); iio_trigger_poll(st->trig);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
......
...@@ -106,8 +106,7 @@ static const struct attribute_group *iio_trig_prtc_attr_groups[] = { ...@@ -106,8 +106,7 @@ static const struct attribute_group *iio_trig_prtc_attr_groups[] = {
static void iio_prtc_trigger_poll(void *private_data) static void iio_prtc_trigger_poll(void *private_data)
{ {
/* Timestamp is not provided currently */ iio_trigger_poll(private_data);
iio_trigger_poll(private_data, 0);
} }
static const struct iio_trigger_ops iio_prtc_trigger_ops = { static const struct iio_trigger_ops iio_prtc_trigger_ops = {
......
...@@ -129,12 +129,11 @@ void iio_trigger_unregister(struct iio_trigger *trig_info); ...@@ -129,12 +129,11 @@ void iio_trigger_unregister(struct iio_trigger *trig_info);
/** /**
* iio_trigger_poll() - called on a trigger occurring * iio_trigger_poll() - called on a trigger occurring
* @trig: trigger which occurred * @trig: trigger which occurred
* @time: timestamp when trigger occurred
* *
* Typically called in relevant hardware interrupt handler. * Typically called in relevant hardware interrupt handler.
**/ **/
void iio_trigger_poll(struct iio_trigger *trig, s64 time); void iio_trigger_poll(struct iio_trigger *trig);
void iio_trigger_poll_chained(struct iio_trigger *trig, s64 time); void iio_trigger_poll_chained(struct iio_trigger *trig);
irqreturn_t iio_trigger_generic_data_rdy_poll(int irq, void *private); irqreturn_t iio_trigger_generic_data_rdy_poll(int irq, void *private);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册