diff options
author | Jonathan Cameron <jic23@cam.ac.uk> | 2011-04-18 12:59:04 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-25 17:24:34 -0700 |
commit | bdd560c52b023cd23b6b082ca64c062cacc23e3f (patch) | |
tree | 5b7dff46344cb1f002451937fe7cd0777e066ba1 /drivers/staging/iio/accel/adis16240_trigger.c | |
parent | 80782446bce545d09e60fe391cb9e530b8809d20 (diff) |
staging:iio:adis16240 replace unnecessary event line registration.
Untested but identical in form to those that have been.
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Acked-by: Michael Hennerich <michael.hennerich@analog.com>
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 | 46 |
1 files changed, 21 insertions, 25 deletions
diff --git a/drivers/staging/iio/accel/adis16240_trigger.c b/drivers/staging/iio/accel/adis16240_trigger.c index 6cb8681f2853..3976c85cb72c 100644 --- a/drivers/staging/iio/accel/adis16240_trigger.c +++ b/drivers/staging/iio/accel/adis16240_trigger.c @@ -15,21 +15,13 @@ /** * adis16240_data_rdy_trig_poll() the event handler for the data rdy trig **/ -static int adis16240_data_rdy_trig_poll(struct iio_dev *dev_info, - int index, - s64 timestamp, - int no_test) +static irqreturn_t adis16240_data_rdy_trig_poll(int irq, void *trig) { - struct adis16240_state *st = iio_dev_get_devdata(dev_info); - struct iio_trigger *trig = st->trig; - - iio_trigger_poll(trig, timestamp); - + disable_irq_nosync(irq); + iio_trigger_poll(trig, iio_get_time_ns()); return IRQ_HANDLED; } -IIO_EVENT_SH(data_rdy_trig, &adis16240_data_rdy_trig_poll); - static IIO_TRIGGER_NAME_ATTR; static struct attribute *adis16240_trigger_attrs[] = { @@ -49,20 +41,9 @@ static int adis16240_data_rdy_trigger_set_state(struct iio_trigger *trig, { struct adis16240_state *st = trig->private_data; struct iio_dev *indio_dev = st->indio_dev; - int ret = 0; dev_dbg(&indio_dev->dev, "%s (%d)\n", __func__, state); - ret = adis16240_set_irq(&st->indio_dev->dev, state); - if (state == false) { - iio_remove_event_from_list(&iio_event_data_rdy_trig, - &indio_dev->interrupts[0] - ->ev_list); - flush_scheduled_work(); - } else { - iio_add_event_to_list(&iio_event_data_rdy_trig, - &indio_dev->interrupts[0]->ev_list); - } - return ret; + return adis16240_set_irq(&st->indio_dev->dev, state); } /** @@ -82,12 +63,24 @@ int adis16240_probe_trigger(struct iio_dev *indio_dev) struct adis16240_state *st = indio_dev->dev_data; st->trig = iio_allocate_trigger(); + if (st->trig == NULL) { + ret = -ENOMEM; + goto error_ret; + } + ret = request_irq(st->us->irq, + adis16240_data_rdy_trig_poll, + IRQF_TRIGGER_RISING, + "adis16240", + st->trig); + 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_trig; + goto error_free_irq; } st->trig->dev.parent = &st->us->dev; st->trig->owner = THIS_MODULE; @@ -106,9 +99,11 @@ int adis16240_probe_trigger(struct iio_dev *indio_dev) 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_ret: return ret; } @@ -118,5 +113,6 @@ void adis16240_remove_trigger(struct iio_dev *indio_dev) iio_trigger_unregister(state->trig); kfree(state->trig->name); + free_irq(state->us->irq, state->trig); iio_free_trigger(state->trig); } |