Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2662051e authored by Jonathan Cameron's avatar Jonathan Cameron Committed by Greg Kroah-Hartman
Browse files

staging: iio: Add stubs for iio_ring_buffer_[un]register and equivalent driver stubs 



Signed-off-by: default avatarJonathan Cameron <jic23@cam.ac.uk>
Acked-by: default avatarBarry Song <21cnbao@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent e0bcb775

drivers/staging/iio/accel/adis16209.h

+0 −11
Original line number Diff line number Diff line
@@ -147,8 +147,6 @@ ssize_t adis16209_read_data_from_ring(struct device *dev, 
int adis16209_configure_ring(struct iio_dev *indio_dev);

void adis16209_unconfigure_ring(struct iio_dev *indio_dev);



int adis16209_initialize_ring(struct iio_ring_buffer *ring);

void adis16209_uninitialize_ring(struct iio_ring_buffer *ring);

#else /* CONFIG_IIO_RING_BUFFER */



static inline void adis16209_remove_trigger(struct iio_dev *indio_dev)
@@ -177,14 +175,5 @@ static inline void adis16209_unconfigure_ring(struct iio_dev *indio_dev) 
{

}



static inline int adis16209_initialize_ring(struct iio_ring_buffer *ring)

{

	return 0;

}



static inline void adis16209_uninitialize_ring(struct iio_ring_buffer *ring)

{

}



#endif /* CONFIG_IIO_RING_BUFFER */

#endif /* SPI_ADIS16209_H_ */

drivers/staging/iio/accel/adis16209_core.c

+4 −3
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 


#include "../iio.h"

#include "../sysfs.h"

#include "../ring_generic.h"

#include "accel.h"

#include "inclinometer.h"

#include "../gyro/gyro.h"
@@ -520,7 +521,7 @@ static int __devinit adis16209_probe(struct spi_device *spi) 
		goto error_unreg_ring_funcs;

	regdone = 1;



	ret = adis16209_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;
@@ -552,7 +553,7 @@ static int __devinit adis16209_probe(struct spi_device *spi) 
	if (spi->irq)

		iio_unregister_interrupt_line(st->indio_dev, 0);

error_uninitialize_ring:

	adis16209_uninitialize_ring(st->indio_dev->ring);

	iio_ring_buffer_unregister(st->indio_dev->ring);

error_unreg_ring_funcs:

	adis16209_unconfigure_ring(st->indio_dev);

error_free_dev:
@@ -581,7 +582,7 @@ static int adis16209_remove(struct spi_device *spi) 
	if (spi->irq)

		iio_unregister_interrupt_line(indio_dev, 0);



	adis16209_uninitialize_ring(indio_dev->ring);

	iio_ring_buffer_unregister(indio_dev->ring);

	iio_device_unregister(indio_dev);

	adis16209_unconfigure_ring(indio_dev);

	kfree(st->tx);

drivers/staging/iio/accel/adis16209_ring.c

+0 −10
Original line number Diff line number Diff line
@@ -225,13 +225,3 @@ int adis16209_configure_ring(struct iio_dev *indio_dev) 
	iio_sw_rb_free(indio_dev->ring);

	return ret;

}
 


int adis16209_initialize_ring(struct iio_ring_buffer *ring)

{

	return iio_ring_buffer_register(ring, 0);

}



void adis16209_uninitialize_ring(struct iio_ring_buffer *ring)

{

	iio_ring_buffer_unregister(ring);

}

drivers/staging/iio/accel/adis16240.h

+0 −11
Original line number Diff line number Diff line
@@ -173,8 +173,6 @@ ssize_t adis16240_read_data_from_ring(struct device *dev, 
int adis16240_configure_ring(struct iio_dev *indio_dev);

void adis16240_unconfigure_ring(struct iio_dev *indio_dev);



int adis16240_initialize_ring(struct iio_ring_buffer *ring);

void adis16240_uninitialize_ring(struct iio_ring_buffer *ring);

#else /* CONFIG_IIO_RING_BUFFER */



static inline void adis16240_remove_trigger(struct iio_dev *indio_dev)
@@ -203,14 +201,5 @@ static inline void adis16240_unconfigure_ring(struct iio_dev *indio_dev) 
{

}



static inline int adis16240_initialize_ring(struct iio_ring_buffer *ring)

{

	return 0;

}



static inline void adis16240_uninitialize_ring(struct iio_ring_buffer *ring)

{

}



#endif /* CONFIG_IIO_RING_BUFFER */

#endif /* SPI_ADIS16240_H_ */

drivers/staging/iio/accel/adis16240_core.c

+4 −3
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 


#include "../iio.h"

#include "../sysfs.h"

#include "../ring_generic.h"

#include "accel.h"

#include "../adc/adc.h"
@@ -502,7 +503,7 @@ static int __devinit adis16240_probe(struct spi_device *spi) 
		goto error_unreg_ring_funcs;

	regdone = 1;



	ret = adis16240_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;
@@ -534,7 +535,7 @@ static int __devinit adis16240_probe(struct spi_device *spi) 
	if (spi->irq)

		iio_unregister_interrupt_line(st->indio_dev, 0);

error_uninitialize_ring:

	adis16240_uninitialize_ring(st->indio_dev->ring);

	iio_ring_buffer_unregister(st->indio_dev->ring);

error_unreg_ring_funcs:

	adis16240_unconfigure_ring(st->indio_dev);

error_free_dev:
@@ -563,7 +564,7 @@ static int adis16240_remove(struct spi_device *spi) 
	if (spi->irq)

		iio_unregister_interrupt_line(indio_dev, 0);



	adis16240_uninitialize_ring(indio_dev->ring);

	iio_ring_buffer_unregister(indio_dev->ring);

	iio_device_unregister(indio_dev);

	adis16240_unconfigure_ring(indio_dev);

	kfree(st->tx);