diff options
author | Jonathan Cameron <jic23@cam.ac.uk> | 2011-05-18 14:41:36 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-05-19 16:14:52 -0700 |
commit | d6d30d2685ca7605c5e142f40b8e0777d54755c2 (patch) | |
tree | 63f1ac24da2f5df6f2d97f19cb77c4daaaab40db /drivers/staging/iio/accel/adis16240_trigger.c | |
parent | d7e044f146ade0336d431f1c15d4915565731963 (diff) | |
download | op-kernel-dev-d6d30d2685ca7605c5e142f40b8e0777d54755c2.zip op-kernel-dev-d6d30d2685ca7605c5e142f40b8e0777d54755c2.tar.gz |
staging:iio:accel:adis16240 move to irqchip based trigger handling.
Untested.
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/iio/accel/adis16240_trigger.c')
-rw-r--r-- | drivers/staging/iio/accel/adis16240_trigger.c | 37 |
1 files changed, 12 insertions, 25 deletions
diff --git a/drivers/staging/iio/accel/adis16240_trigger.c b/drivers/staging/iio/accel/adis16240_trigger.c index 3976c85..55e2145 100644 --- a/drivers/staging/iio/accel/adis16240_trigger.c +++ b/drivers/staging/iio/accel/adis16240_trigger.c @@ -17,7 +17,6 @@ **/ static irqreturn_t adis16240_data_rdy_trig_poll(int irq, void *trig) { - disable_irq_nosync(irq); iio_trigger_poll(trig, iio_get_time_ns()); return IRQ_HANDLED; } @@ -46,27 +45,23 @@ static int adis16240_data_rdy_trigger_set_state(struct iio_trigger *trig, return adis16240_set_irq(&st->indio_dev->dev, state); } -/** - * adis16240_trig_try_reen() try renabling irq for data rdy trigger - * @trig: the datardy trigger - **/ -static int adis16240_trig_try_reen(struct iio_trigger *trig) -{ - struct adis16240_state *st = trig->private_data; - enable_irq(st->us->irq); - return 0; -} - int adis16240_probe_trigger(struct iio_dev *indio_dev) { int ret; struct adis16240_state *st = indio_dev->dev_data; + char *name; - st->trig = iio_allocate_trigger(); - if (st->trig == NULL) { + name = kasprintf(GFP_KERNEL, "adis16240-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, adis16240_data_rdy_trig_poll, IRQF_TRIGGER_RISING, @@ -75,34 +70,26 @@ int adis16240_probe_trigger(struct iio_dev *indio_dev) if (ret) goto error_free_trig; - st->trig->name = kasprintf(GFP_KERNEL, - "adis16240-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 = &adis16240_data_rdy_trigger_set_state; - st->trig->try_reenable = &adis16240_trig_try_reen; st->trig->control_attrs = &adis16240_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; } |