staging:iio:accel:adis16209 allocate tx and rx in state plus state via iio_priv

[deliverable/linux.git] / drivers / staging / iio / accel / adis16209_trigger.c

diff --git a/drivers/staging/iio/accel/adis16209_trigger.c b/drivers/staging/iio/accel/adis16209_trigger.c
index 0847ce5a3cded59ba2ea0680efe0ea4c3693c9ec..6df7b47ec7b43ea38de6d8718849da20a8826dfb 100644 (file)
--- a/drivers/staging/iio/accel/adis16209_trigger.c
+++ b/drivers/staging/iio/accel/adis16209_trigger.c
@@ -21,48 +21,27 @@ static irqreturn_t adis16209_data_rdy_trig_poll(int irq, void *trig)
        return IRQ_HANDLED;
 }
 
-static IIO_TRIGGER_NAME_ATTR;
-
-static struct attribute *adis16209_trigger_attrs[] = {
-       &dev_attr_name.attr,
-       NULL,
-};
-
-static const struct attribute_group adis16209_trigger_attr_group = {
-       .attrs = adis16209_trigger_attrs,
-};
-
 /**
  * adis16209_data_rdy_trigger_set_state() set datardy interrupt state
  **/
 static int adis16209_data_rdy_trigger_set_state(struct iio_trigger *trig,
                                                bool state)
 {
-       struct adis16209_state *st = trig->private_data;
-       struct iio_dev *indio_dev = st->indio_dev;
+       struct iio_dev *indio_dev = trig->private_data;
 
        dev_dbg(&indio_dev->dev, "%s (%d)\n", __func__, state);
-       return adis16209_set_irq(st->indio_dev, state);
+       return adis16209_set_irq(indio_dev, state);
 }
 
 int adis16209_probe_trigger(struct iio_dev *indio_dev)
 {
        int ret;
-       struct adis16209_state *st = indio_dev->dev_data;
-       char *name;
-
-       name = kasprintf(GFP_KERNEL,
-                        "adis16209-dev%d",
-                        indio_dev->id);
-       if (name == NULL) {
-               ret = -ENOMEM;
-               goto error_ret;
-       }
+       struct adis16209_state *st = iio_priv(indio_dev);
 
-       st->trig = iio_allocate_trigger_named(name);
+       st->trig = iio_allocate_trigger("adis16209-dev%d", indio_dev->id);
        if (st->trig == NULL) {
                ret = -ENOMEM;
-               goto error_free_name;
+               goto error_ret;
        }
 
        ret = request_irq(st->us->irq,
@@ -74,9 +53,8 @@ int adis16209_probe_trigger(struct iio_dev *indio_dev)
                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 = &adis16209_data_rdy_trigger_set_state;
-       st->trig->control_attrs = &adis16209_trigger_attr_group;
        ret = iio_trigger_register(st->trig);
 
        /* select default trigger */
@@ -90,18 +68,15 @@ 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;
 }
 
 void adis16209_remove_trigger(struct iio_dev *indio_dev)
 {
-       struct adis16209_state *state = indio_dev->dev_data;
+       struct adis16209_state *st = iio_priv(indio_dev);
 
-       iio_trigger_unregister(state->trig);
-       kfree(state->trig->name);
-       free_irq(state->us->irq, state->trig);
-       iio_free_trigger(state->trig);
+       iio_trigger_unregister(st->trig);
+       free_irq(st->us->irq, st->trig);
+       iio_free_trigger(st->trig);
 }