diff options
Diffstat (limited to 'drivers/staging/iio/accel/adis16201_trigger.c')
-rw-r--r-- | drivers/staging/iio/accel/adis16201_trigger.c | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/drivers/staging/iio/accel/adis16201_trigger.c b/drivers/staging/iio/accel/adis16201_trigger.c index bfd43c5..bea917e 100644 --- a/drivers/staging/iio/accel/adis16201_trigger.c +++ b/drivers/staging/iio/accel/adis16201_trigger.c @@ -11,17 +11,6 @@ #include "../trigger.h" #include "adis16201.h" -static DEVICE_ATTR(name, S_IRUGO, iio_trigger_read_name, NULL); - -static struct attribute *adis16201_trigger_attrs[] = { - &dev_attr_name.attr, - NULL, -}; - -static const struct attribute_group adis16201_trigger_attr_group = { - .attrs = adis16201_trigger_attrs, -}; - /** * adis16201_data_rdy_trigger_set_state() set datardy interrupt state **/ @@ -39,19 +28,11 @@ int adis16201_probe_trigger(struct iio_dev *indio_dev) { int ret; struct adis16201_state *st = indio_dev->dev_data; - char *name; - name = kasprintf(GFP_KERNEL, - "adis16201-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("adis16201-dev%d", indio_dev->id); if (st->trig == NULL) { ret = -ENOMEM; - goto error_free_name; + goto error_ret; } ret = request_irq(st->us->irq, &iio_trigger_generic_data_rdy_poll, @@ -64,7 +45,6 @@ int adis16201_probe_trigger(struct iio_dev *indio_dev) st->trig->owner = THIS_MODULE; st->trig->private_data = st; st->trig->set_trigger_state = &adis16201_data_rdy_trigger_set_state; - st->trig->control_attrs = &adis16201_trigger_attr_group; ret = iio_trigger_register(st->trig); /* select default trigger */ @@ -78,8 +58,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; } @@ -89,7 +67,6 @@ void adis16201_remove_trigger(struct iio_dev *indio_dev) struct adis16201_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); } |