staging:iio:trigger handle name attr in core, remove old alloc and register any contr...

[karo-tx-linux.git] / drivers / staging / iio / accel / adis16240_trigger.c

diff --git a/drivers/staging/iio/accel/adis16240_trigger.c b/drivers/staging/iio/accel/adis16240_trigger.c
index d5bda92d9492c5105419026fa4640a06460e9441..ece3ca8fb7eb2ea5823f75beae8c89d82c3f0a7f 100644 (file)
--- a/drivers/staging/iio/accel/adis16240_trigger.c
+++ b/drivers/staging/iio/accel/adis16240_trigger.c
@@ -21,17 +21,6 @@ static irqreturn_t adis16240_data_rdy_trig_poll(int irq, void *trig)
        return IRQ_HANDLED;
 }
 
-static IIO_TRIGGER_NAME_ATTR;
-
-static struct attribute *adis16240_trigger_attrs[] = {
-       &dev_attr_name.attr,
-       NULL,
-};
-
-static const struct attribute_group adis16240_trigger_attr_group = {
-       .attrs = adis16240_trigger_attrs,
-};
-
 /**
  * adis16240_data_rdy_trigger_set_state() set datardy interrupt state
  **/
@@ -49,17 +38,11 @@ int adis16240_probe_trigger(struct iio_dev *indio_dev)
 {
        int ret;
        struct adis16240_state *st = indio_dev->dev_data;
-       char *name;
 
-       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);
+       st->trig = iio_allocate_trigger("adis16240-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,7 +57,6 @@ int adis16240_probe_trigger(struct iio_dev *indio_dev)
        st->trig->owner = THIS_MODULE;
        st->trig->private_data = st;
        st->trig->set_trigger_state = &adis16240_data_rdy_trigger_set_state;
-       st->trig->control_attrs = &adis16240_trigger_attr_group;
        ret = iio_trigger_register(st->trig);
 
        /* select default trigger */
@@ -88,8 +70,6 @@ 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;
 }
@@ -99,7 +79,6 @@ void adis16240_remove_trigger(struct iio_dev *indio_dev)
        struct adis16240_state *state = indio_dev->dev_data;
 
        iio_trigger_unregister(state->trig);
-       kfree(state->trig->name);
        free_irq(state->us->irq, state->trig);
        iio_free_trigger(state->trig);
 }