diff options
Diffstat (limited to 'drivers/staging/iio/meter/ade7758_trigger.c')
-rw-r--r-- | drivers/staging/iio/meter/ade7758_trigger.c | 95 |
1 files changed, 40 insertions, 55 deletions
diff --git a/drivers/staging/iio/meter/ade7758_trigger.c b/drivers/staging/iio/meter/ade7758_trigger.c index 60abca0c28ff..a5c3248151ed 100644 --- a/drivers/staging/iio/meter/ade7758_trigger.c +++ b/drivers/staging/iio/meter/ade7758_trigger.c @@ -1,3 +1,11 @@ +/* + * ADE7758 Poly Phase Multifunction Energy Metering IC driver + * + * Copyright 2010-2011 Analog Devices Inc. + * + * Licensed under the GPL-2. + */ + #include <linux/interrupt.h> #include <linux/irq.h> #include <linux/mutex.h> @@ -15,56 +23,24 @@ /** * ade7758_data_rdy_trig_poll() the event handler for the data rdy trig **/ -static int ade7758_data_rdy_trig_poll(struct iio_dev *dev_info, - int index, - s64 timestamp, - int no_test) +static irqreturn_t ade7758_data_rdy_trig_poll(int irq, void *private) { - struct ade7758_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(private, iio_get_time_ns()); return IRQ_HANDLED; } -IIO_EVENT_SH(data_rdy_trig, &ade7758_data_rdy_trig_poll); - -static DEVICE_ATTR(name, S_IRUGO, iio_trigger_read_name, NULL); - -static struct attribute *ade7758_trigger_attrs[] = { - &dev_attr_name.attr, - NULL, -}; - -static const struct attribute_group ade7758_trigger_attr_group = { - .attrs = ade7758_trigger_attrs, -}; - /** * ade7758_data_rdy_trigger_set_state() set datardy interrupt state **/ static int ade7758_data_rdy_trigger_set_state(struct iio_trigger *trig, bool state) { - struct ade7758_state *st = trig->private_data; - struct iio_dev *indio_dev = st->indio_dev; - int ret = 0; + struct iio_dev *indio_dev = trig->private_data; dev_dbg(&indio_dev->dev, "%s (%d)\n", __func__, state); - ret = ade7758_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); - /* possible quirk with handler currently worked around - by ensuring the work queue is empty */ - flush_scheduled_work(); - } else { - iio_add_event_to_list(&iio_event_data_rdy_trig, - &indio_dev->interrupts[0]->ev_list); - } - return ret; + return ade7758_set_irq(&indio_dev->dev, state); } /** @@ -73,7 +49,9 @@ static int ade7758_data_rdy_trigger_set_state(struct iio_trigger *trig, **/ static int ade7758_trig_try_reen(struct iio_trigger *trig) { - struct ade7758_state *st = trig->private_data; + struct iio_dev *indio_dev = trig->private_data; + struct ade7758_state *st = iio_priv(indio_dev); + enable_irq(st->us->irq); /* irq reenabled so success! */ return 0; @@ -81,45 +59,52 @@ static int ade7758_trig_try_reen(struct iio_trigger *trig) int ade7758_probe_trigger(struct iio_dev *indio_dev) { + struct ade7758_state *st = iio_priv(indio_dev); int ret; - struct ade7758_state *st = indio_dev->dev_data; - st->trig = iio_allocate_trigger(); - st->trig->name = kasprintf(GFP_KERNEL, - "ade7758-dev%d", - indio_dev->id); - if (!st->trig->name) { + st->trig = iio_allocate_trigger("%s-dev%d", + spi_get_device_id(st->us)->name, + indio_dev->id); + if (st->trig == NULL) { ret = -ENOMEM; - goto error_free_trig; + goto error_ret; } + + ret = request_irq(st->us->irq, + ade7758_data_rdy_trig_poll, + IRQF_TRIGGER_LOW, + spi_get_device_id(st->us)->name, + st->trig); + if (ret) + goto error_free_trig; + st->trig->dev.parent = &st->us->dev; st->trig->owner = THIS_MODULE; - st->trig->private_data = st; + st->trig->private_data = indio_dev; st->trig->set_trigger_state = &ade7758_data_rdy_trigger_set_state; st->trig->try_reenable = &ade7758_trig_try_reen; - st->trig->control_attrs = &ade7758_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_ret: return ret; } void ade7758_remove_trigger(struct iio_dev *indio_dev) { - struct ade7758_state *state = indio_dev->dev_data; + struct ade7758_state *st = iio_priv(indio_dev); - iio_trigger_unregister(state->trig); - kfree(state->trig->name); - iio_free_trigger(state->trig); + iio_trigger_unregister(st->trig); + free_irq(st->us->irq, st->trig); + iio_free_trigger(st->trig); } |