From 80142f0de68a3d68f114f25f56e736c4a63e1c18 Mon Sep 17 00:00:00 2001 From: Jonathan Cameron Date: Wed, 18 May 2011 14:41:34 +0100 Subject: staging:iio:accel:adis16204 move to irqchip based trigger handling. Untested. Signed-off-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman --- drivers/staging/iio/accel/adis16204_trigger.c | 51 +++++++++------------------ 1 file changed, 16 insertions(+), 35 deletions(-) (limited to 'drivers/staging/iio/accel/adis16204_trigger.c') diff --git a/drivers/staging/iio/accel/adis16204_trigger.c b/drivers/staging/iio/accel/adis16204_trigger.c index 85c648765f2..5f083f8147d 100644 --- a/drivers/staging/iio/accel/adis16204_trigger.c +++ b/drivers/staging/iio/accel/adis16204_trigger.c @@ -12,16 +12,6 @@ #include "../trigger.h" #include "adis16204.h" -/** - * adis16204_data_rdy_trig_poll() the event handler for the data rdy trig - **/ -static irqreturn_t adis16204_data_rdy_trig_poll(int irq, void *private) -{ - disable_irq_nosync(irq); - iio_trigger_poll(private, iio_get_time_ns()); - return IRQ_HANDLED; -} - static DEVICE_ATTR(name, S_IRUGO, iio_trigger_read_name, NULL); static struct attribute *adis16204_trigger_attrs[] = { @@ -46,63 +36,54 @@ static int adis16204_data_rdy_trigger_set_state(struct iio_trigger *trig, return adis16204_set_irq(&st->indio_dev->dev, state); } -/** - * adis16204_trig_try_reen() try renabling irq for data rdy trigger - * @trig: the datardy trigger - **/ -static int adis16204_trig_try_reen(struct iio_trigger *trig) -{ - struct adis16204_state *st = trig->private_data; - enable_irq(st->us->irq); - return 0; -} - int adis16204_probe_trigger(struct iio_dev *indio_dev) { int ret; struct adis16204_state *st = indio_dev->dev_data; + char *name; - st->trig = iio_allocate_trigger(); - if (st->trig == NULL) { + name = kasprintf(GFP_KERNEL, + "adis16204-dev%d", + indio_dev->id); + if (name == NULL) { ret = -ENOMEM; goto error_ret; } + + st->trig = iio_allocate_trigger_named(name); + if (st->trig == NULL) { + ret = -ENOMEM; + goto error_free_name; + } + ret = request_irq(st->us->irq, - adis16204_data_rdy_trig_poll, + &iio_trigger_generic_data_rdy_poll, IRQF_TRIGGER_RISING, "adis16204", st->trig); if (ret) goto error_free_trig; - st->trig->name = kasprintf(GFP_KERNEL, - "adis16204-dev%d", - indio_dev->id); - if (!st->trig->name) { - ret = -ENOMEM; - goto error_free_irq; - } st->trig->dev.parent = &st->us->dev; st->trig->owner = THIS_MODULE; st->trig->private_data = st; st->trig->set_trigger_state = &adis16204_data_rdy_trigger_set_state; - st->trig->try_reenable = &adis16204_trig_try_reen; st->trig->control_attrs = &adis16204_trigger_attr_group; ret = iio_trigger_register(st->trig); /* select default trigger */ indio_dev->trig = st->trig; if (ret) - goto error_free_trig_name; + goto error_free_irq; return 0; -error_free_trig_name: - kfree(st->trig->name); error_free_irq: free_irq(st->us->irq, st->trig); error_free_trig: iio_free_trigger(st->trig); +error_free_name: + kfree(name); error_ret: return ret; } -- cgit v1.2.3