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

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

diff --git a/drivers/staging/iio/accel/adis16204_trigger.c b/drivers/staging/iio/accel/adis16204_trigger.c
index a00668c0b841d3a717193b4fd87cc5d1c0689143..5e1f9ae9d5c182e09085a852d6c2c0ef6acebf15 100644 (file)
--- a/drivers/staging/iio/accel/adis16204_trigger.c
+++ b/drivers/staging/iio/accel/adis16204_trigger.c
@@ -12,17 +12,6 @@
 #include "../trigger.h"
 #include "adis16204.h"
 
-static DEVICE_ATTR(name, S_IRUGO, iio_trigger_read_name, NULL);
-
-static struct attribute *adis16204_trigger_attrs[] = {
-       &dev_attr_name.attr,
-       NULL,
-};
-
-static const struct attribute_group adis16204_trigger_attr_group = {
-       .attrs = adis16204_trigger_attrs,
-};
-
 /**
  * adis16204_data_rdy_trigger_set_state() set datardy interrupt state
  **/
@@ -40,20 +29,11 @@ int adis16204_probe_trigger(struct iio_dev *indio_dev)
 {
        int ret;
        struct adis16204_state *st = indio_dev->dev_data;
-       char *name;
-
-       name = kasprintf(GFP_KERNEL,
-                        "adis16204-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("adis16204-dev%d", indio_dev->id);
        if (st->trig == NULL) {
                ret = -ENOMEM;
-               goto error_free_name;
+               goto error_ret;
        }
 
        ret = request_irq(st->us->irq,
@@ -68,7 +48,6 @@ int adis16204_probe_trigger(struct iio_dev *indio_dev)
        st->trig->owner = THIS_MODULE;
        st->trig->private_data = st;
        st->trig->set_trigger_state = &adis16204_data_rdy_trigger_set_state;
-       st->trig->control_attrs = &adis16204_trigger_attr_group;
        ret = iio_trigger_register(st->trig);
 
        /* select default trigger */
@@ -82,8 +61,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;
 }
@@ -93,7 +70,6 @@ void adis16204_remove_trigger(struct iio_dev *indio_dev)
        struct adis16204_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);
 }