diff options
author | Jonathan Cameron <jic23@cam.ac.uk> | 2011-04-18 12:59:05 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-25 17:24:34 -0700 |
commit | 48f27194a3d3ea8410af72168cc4cf6f9ebf4289 (patch) | |
tree | ea3f99e26b94b0728b62303ea2d7193daf1d0511 /drivers/staging/iio/accel/adis16209_core.c | |
parent | bdd560c52b023cd23b6b082ca64c062cacc23e3f (diff) | |
download | op-kernel-dev-48f27194a3d3ea8410af72168cc4cf6f9ebf4289.zip op-kernel-dev-48f27194a3d3ea8410af72168cc4cf6f9ebf4289.tar.gz |
staging:iio:adis16209 replace unnecessary event line registration.
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/adis16209_core.c')
-rw-r--r-- | drivers/staging/iio/accel/adis16209_core.c | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/drivers/staging/iio/accel/adis16209_core.c b/drivers/staging/iio/accel/adis16209_core.c index d2fb990..54b5bae 100644 --- a/drivers/staging/iio/accel/adis16209_core.c +++ b/drivers/staging/iio/accel/adis16209_core.c @@ -429,14 +429,6 @@ static IIO_DEVICE_ATTR(reset, S_IWUSR, NULL, adis16209_write_reset, 0); static IIO_CONST_ATTR_NAME("adis16209"); -static struct attribute *adis16209_event_attributes[] = { - NULL -}; - -static struct attribute_group adis16209_event_attribute_group = { - .attrs = adis16209_event_attributes, -}; - static struct attribute *adis16209_attributes[] = { &iio_dev_attr_in0_supply_raw.dev_attr.attr, &iio_const_attr_in0_supply_scale.dev_attr.attr, @@ -495,8 +487,6 @@ static int __devinit adis16209_probe(struct spi_device *spi) } st->indio_dev->dev.parent = &spi->dev; - st->indio_dev->num_interrupt_lines = 1; - st->indio_dev->event_attrs = &adis16209_event_attribute_group; st->indio_dev->attrs = &adis16209_attribute_group; st->indio_dev->dev_data = (void *)(st); st->indio_dev->driver_module = THIS_MODULE; @@ -518,17 +508,9 @@ static int __devinit adis16209_probe(struct spi_device *spi) } if (spi->irq) { - ret = iio_register_interrupt_line(spi->irq, - st->indio_dev, - 0, - IRQF_TRIGGER_RISING, - "adis16209"); - if (ret) - goto error_uninitialize_ring; - ret = adis16209_probe_trigger(st->indio_dev); if (ret) - goto error_unregister_line; + goto error_uninitialize_ring; } /* Get the device into a sane initial state */ @@ -539,9 +521,6 @@ static int __devinit adis16209_probe(struct spi_device *spi) error_remove_trigger: adis16209_remove_trigger(st->indio_dev); -error_unregister_line: - if (spi->irq) - iio_unregister_interrupt_line(st->indio_dev, 0); error_uninitialize_ring: iio_ring_buffer_unregister(st->indio_dev->ring); error_unreg_ring_funcs: @@ -569,9 +548,6 @@ static int adis16209_remove(struct spi_device *spi) flush_scheduled_work(); adis16209_remove_trigger(indio_dev); - if (spi->irq) - iio_unregister_interrupt_line(indio_dev, 0); - iio_ring_buffer_unregister(indio_dev->ring); iio_device_unregister(indio_dev); adis16209_unconfigure_ring(indio_dev); |