diff options
author | Jonathan Cameron <jic23@cam.ac.uk> | 2011-05-18 14:42:22 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-05-19 16:15:02 -0700 |
commit | 59c85e82c2e7a672cb4342dc5ccf9df8a3a14f73 (patch) | |
tree | 7df58c13e2254bf55692a20841bc3553583d11ef /drivers/staging/iio/gyro/adis16260_trigger.c | |
parent | 3b8ebfb47f0cacc82c88b6f886ad84d78d6fdd61 (diff) |
staging:iio:trigger handle name attr in core, remove old alloc and register any control_attrs via struct device
As the majority of triggers don't actually have any other control_attrs lets use the fact
that struct device has a groups element when we do need to have these attributes registered.
A vargs function is used to cut down on lots of building strings in every single driver
just in order to pass them into the allocate.
Also iio_allocate_trigger_named -> iio_allocate_trigger as there is no
unamed version any more, so that is now just confusing.
Blackfin tested and fixed by Michael Hennerich.
V2: Elements from Michael Hennerich's patches for the ade7758
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/iio/gyro/adis16260_trigger.c')
-rw-r--r-- | drivers/staging/iio/gyro/adis16260_trigger.c | 30 |
1 files changed, 4 insertions, 26 deletions
diff --git a/drivers/staging/iio/gyro/adis16260_trigger.c b/drivers/staging/iio/gyro/adis16260_trigger.c index 228272e6dbc..4f10fb54335 100644 --- a/drivers/staging/iio/gyro/adis16260_trigger.c +++ b/drivers/staging/iio/gyro/adis16260_trigger.c @@ -12,17 +12,6 @@ #include "../trigger.h" #include "adis16260.h" -static IIO_TRIGGER_NAME_ATTR; - -static struct attribute *adis16260_trigger_attrs[] = { - &dev_attr_name.attr, - NULL, -}; - -static const struct attribute_group adis16260_trigger_attr_group = { - .attrs = adis16260_trigger_attrs, -}; - /** * adis16260_data_rdy_trigger_set_state() set datardy interrupt state **/ @@ -40,20 +29,13 @@ int adis16260_probe_trigger(struct iio_dev *indio_dev) { int ret; struct adis16260_state *st = indio_dev->dev_data; - char *name; - name = kasprintf(GFP_KERNEL, - "%s-dev%d", - spi_get_device_id(st->us)->name, - indio_dev->id); - if (name == NULL) { - ret = -ENOMEM; - goto error_ret; - } - st->trig = iio_allocate_trigger_named(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_name; + goto error_ret; } ret = request_irq(st->us->irq, @@ -68,7 +50,6 @@ int adis16260_probe_trigger(struct iio_dev *indio_dev) st->trig->owner = THIS_MODULE; st->trig->private_data = st; st->trig->set_trigger_state = &adis16260_data_rdy_trigger_set_state; - st->trig->control_attrs = &adis16260_trigger_attr_group; ret = iio_trigger_register(st->trig); /* select default trigger */ @@ -82,8 +63,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 +72,6 @@ void adis16260_remove_trigger(struct iio_dev *indio_dev) struct adis16260_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); } |