diff options
author | Jonathan Cameron <jic23@cam.ac.uk> | 2010-07-11 11:39:14 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-07-22 14:38:28 -0400 |
commit | 2662051e0868d1bde0abeea19bd54c3c18941afc (patch) | |
tree | 87a63f47af6c27463aa71c11c8be5e2f2cfdde7a /drivers/staging/iio/imu/adis16400_core.c | |
parent | e0bcb775e8643816a07bf52c6587bb269695fee9 (diff) |
staging: iio: Add stubs for iio_ring_buffer_[un]register and equivalent driver stubs
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Acked-by: Barry Song <21cnbao@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/iio/imu/adis16400_core.c')
-rw-r--r-- | drivers/staging/iio/imu/adis16400_core.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/staging/iio/imu/adis16400_core.c b/drivers/staging/iio/imu/adis16400_core.c index 160585fab31..6013fee218e 100644 --- a/drivers/staging/iio/imu/adis16400_core.c +++ b/drivers/staging/iio/imu/adis16400_core.c | |||
@@ -27,6 +27,7 @@ | |||
27 | 27 | ||
28 | #include "../iio.h" | 28 | #include "../iio.h" |
29 | #include "../sysfs.h" | 29 | #include "../sysfs.h" |
30 | #include "../ring_generic.h" | ||
30 | #include "../accel/accel.h" | 31 | #include "../accel/accel.h" |
31 | #include "../adc/adc.h" | 32 | #include "../adc/adc.h" |
32 | #include "../gyro/gyro.h" | 33 | #include "../gyro/gyro.h" |
@@ -641,7 +642,7 @@ static int __devinit adis16400_probe(struct spi_device *spi) | |||
641 | goto error_unreg_ring_funcs; | 642 | goto error_unreg_ring_funcs; |
642 | regdone = 1; | 643 | regdone = 1; |
643 | 644 | ||
644 | ret = adis16400_initialize_ring(st->indio_dev->ring); | 645 | ret = iio_ring_buffer_register(st->indio_dev->ring, 0); |
645 | if (ret) { | 646 | if (ret) { |
646 | printk(KERN_ERR "failed to initialize the ring\n"); | 647 | printk(KERN_ERR "failed to initialize the ring\n"); |
647 | goto error_unreg_ring_funcs; | 648 | goto error_unreg_ring_funcs; |
@@ -674,7 +675,7 @@ error_unregister_line: | |||
674 | if (st->indio_dev->modes & INDIO_RING_TRIGGERED) | 675 | if (st->indio_dev->modes & INDIO_RING_TRIGGERED) |
675 | iio_unregister_interrupt_line(st->indio_dev, 0); | 676 | iio_unregister_interrupt_line(st->indio_dev, 0); |
676 | error_uninitialize_ring: | 677 | error_uninitialize_ring: |
677 | adis16400_uninitialize_ring(st->indio_dev->ring); | 678 | iio_ring_buffer_unregister(st->indio_dev->ring); |
678 | error_unreg_ring_funcs: | 679 | error_unreg_ring_funcs: |
679 | adis16400_unconfigure_ring(st->indio_dev); | 680 | adis16400_unconfigure_ring(st->indio_dev); |
680 | error_free_dev: | 681 | error_free_dev: |
@@ -709,7 +710,7 @@ static int adis16400_remove(struct spi_device *spi) | |||
709 | if (spi->irq && gpio_is_valid(irq_to_gpio(spi->irq)) > 0) | 710 | if (spi->irq && gpio_is_valid(irq_to_gpio(spi->irq)) > 0) |
710 | iio_unregister_interrupt_line(indio_dev, 0); | 711 | iio_unregister_interrupt_line(indio_dev, 0); |
711 | 712 | ||
712 | adis16400_uninitialize_ring(indio_dev->ring); | 713 | iio_ring_buffer_unregister(st->indio_dev->ring); |
713 | adis16400_unconfigure_ring(indio_dev); | 714 | adis16400_unconfigure_ring(indio_dev); |
714 | iio_device_unregister(indio_dev); | 715 | iio_device_unregister(indio_dev); |
715 | kfree(st->tx); | 716 | kfree(st->tx); |