diff options
| author | Jonathan Cameron <jic23@cam.ac.uk> | 2011-04-18 11:59:02 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-26 00:24:33 (GMT) |
| commit | 37f9d2714a0a95cf7f45e0ed9422eea80490a77c (patch) | |
| tree | c03bb5e44450c10d5dccc0b8b8e3321236c2aaa8 /drivers/staging/iio/accel/adis16204_core.c | |
| parent | 9e558ff5448715a8cca1439e3188611b31ea72ec (diff) | |
| download | linux-37f9d2714a0a95cf7f45e0ed9422eea80490a77c.tar.xz | |
staging:iio:adis16204 replace unnecessary event line registration.
Whilst the adis16204 does indeed support events, currently the driver
does not. The trigger code should never use that infrastructure.
Untested but identical in form to those that have been.
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Acked-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/iio/accel/adis16204_core.c')
| -rw-r--r-- | drivers/staging/iio/accel/adis16204_core.c | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/drivers/staging/iio/accel/adis16204_core.c b/drivers/staging/iio/accel/adis16204_core.c index 97376aa..fe44b25 100644 --- a/drivers/staging/iio/accel/adis16204_core.c +++ b/drivers/staging/iio/accel/adis16204_core.c @@ -432,14 +432,6 @@ static IIO_DEVICE_ATTR(reset, S_IWUSR, NULL, adis16204_write_reset, 0); static IIO_CONST_ATTR(name, "adis16204"); -static struct attribute *adis16204_event_attributes[] = { - NULL -}; - -static struct attribute_group adis16204_event_attribute_group = { - .attrs = adis16204_event_attributes, -}; - static struct attribute *adis16204_attributes[] = { &iio_dev_attr_in0_supply_raw.dev_attr.attr, &iio_const_attr_in0_supply_scale.dev_attr.attr, @@ -500,8 +492,6 @@ static int __devinit adis16204_probe(struct spi_device *spi) } st->indio_dev->dev.parent = &spi->dev; - st->indio_dev->num_interrupt_lines = 1; - st->indio_dev->event_attrs = &adis16204_event_attribute_group; st->indio_dev->attrs = &adis16204_attribute_group; st->indio_dev->dev_data = (void *)(st); st->indio_dev->driver_module = THIS_MODULE; @@ -523,17 +513,9 @@ static int __devinit adis16204_probe(struct spi_device *spi) } if (spi->irq) { - ret = iio_register_interrupt_line(spi->irq, - st->indio_dev, - 0, - IRQF_TRIGGER_RISING, - "adis16204"); - if (ret) - goto error_uninitialize_ring; - ret = adis16204_probe_trigger(st->indio_dev); if (ret) - goto error_unregister_line; + goto error_uninitialize_ring; } /* Get the device into a sane initial state */ @@ -544,9 +526,6 @@ static int __devinit adis16204_probe(struct spi_device *spi) error_remove_trigger: adis16204_remove_trigger(st->indio_dev); -error_unregister_line: - if (spi->irq) - iio_unregister_interrupt_line(st->indio_dev, 0); error_uninitialize_ring: adis16204_uninitialize_ring(st->indio_dev->ring); error_unreg_ring_funcs: @@ -574,9 +553,6 @@ static int adis16204_remove(struct spi_device *spi) flush_scheduled_work(); adis16204_remove_trigger(indio_dev); - if (spi->irq) - iio_unregister_interrupt_line(indio_dev, 0); - adis16204_uninitialize_ring(indio_dev->ring); iio_device_unregister(indio_dev); adis16204_unconfigure_ring(indio_dev); |