|
@@ -27,6 +27,7 @@
|
|
|
|
|
|
#include "../iio.h"
|
|
|
#include "../sysfs.h"
|
|
|
+#include "../ring_generic.h"
|
|
|
#include "../accel/accel.h"
|
|
|
#include "../adc/adc.h"
|
|
|
#include "../gyro/gyro.h"
|
|
@@ -641,7 +642,7 @@ static int __devinit adis16400_probe(struct spi_device *spi)
|
|
|
goto error_unreg_ring_funcs;
|
|
|
regdone = 1;
|
|
|
|
|
|
- ret = adis16400_initialize_ring(st->indio_dev->ring);
|
|
|
+ ret = iio_ring_buffer_register(st->indio_dev->ring, 0);
|
|
|
if (ret) {
|
|
|
printk(KERN_ERR "failed to initialize the ring\n");
|
|
|
goto error_unreg_ring_funcs;
|
|
@@ -674,7 +675,7 @@ error_unregister_line:
|
|
|
if (st->indio_dev->modes & INDIO_RING_TRIGGERED)
|
|
|
iio_unregister_interrupt_line(st->indio_dev, 0);
|
|
|
error_uninitialize_ring:
|
|
|
- adis16400_uninitialize_ring(st->indio_dev->ring);
|
|
|
+ iio_ring_buffer_unregister(st->indio_dev->ring);
|
|
|
error_unreg_ring_funcs:
|
|
|
adis16400_unconfigure_ring(st->indio_dev);
|
|
|
error_free_dev:
|
|
@@ -709,7 +710,7 @@ static int adis16400_remove(struct spi_device *spi)
|
|
|
if (spi->irq && gpio_is_valid(irq_to_gpio(spi->irq)) > 0)
|
|
|
iio_unregister_interrupt_line(indio_dev, 0);
|
|
|
|
|
|
- adis16400_uninitialize_ring(indio_dev->ring);
|
|
|
+ iio_ring_buffer_unregister(st->indio_dev->ring);
|
|
|
adis16400_unconfigure_ring(indio_dev);
|
|
|
iio_device_unregister(indio_dev);
|
|
|
kfree(st->tx);
|