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

staging:iio: tree wide IIO_RING_BUFFER config symbol to IIO_BUFFER 



Functionality is generic, so name is missleading.

Signed-off-by: default avatarJonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent ec3afa40

drivers/staging/iio/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -12,13 +12,13 @@ menuconfig IIO 
	  drivers/staging/iio/Documentation for more information.

if IIO



config IIO_RING_BUFFER

config IIO_BUFFER

	bool "Enable buffer support within IIO"

	help

	  Provide core support for various buffer based data

	  acquisition methods.



if IIO_RING_BUFFER

if IIO_BUFFER



config IIO_SW_RING

       select IIO_TRIGGER
@@ -38,7 +38,7 @@ config IIO_KFIFO_BUF 
	  no buffer events so it is up to userspace to work out how

	  often to read from the buffer.



endif # IIO_RINGBUFFER

endif # IIO_BUFFER



config IIO_TRIGGER

	boolean "Enable triggered sampling support"

drivers/staging/iio/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


obj-$(CONFIG_IIO) += industrialio.o

industrialio-y := industrialio-core.o

industrialio-$(CONFIG_IIO_RING_BUFFER) += industrialio-ring.o

industrialio-$(CONFIG_IIO_BUFFER) += industrialio-ring.o

industrialio-$(CONFIG_IIO_TRIGGER) += industrialio-trigger.o



obj-$(CONFIG_IIO_SW_RING) += ring_sw.o

drivers/staging/iio/accel/Kconfig

+14 −14
Original line number Diff line number Diff line
@@ -6,8 +6,8 @@ menu "Accelerometers" 
config ADIS16201

	tristate "Analog Devices ADIS16201 Dual-Axis Digital Inclinometer and Accelerometer"

	depends on SPI

	select IIO_TRIGGER if IIO_RING_BUFFER

	select IIO_SW_RING if IIO_RING_BUFFER

	select IIO_TRIGGER if IIO_BUFFER

	select IIO_SW_RING if IIO_BUFFER

	help

	  Say yes here to build support for Analog Devices adis16201 dual-axis

	  digital inclinometer and accelerometer.
@@ -15,8 +15,8 @@ config ADIS16201 
config ADIS16203

	tristate "Analog Devices ADIS16203 Programmable 360 Degrees Inclinometer"

	depends on SPI

	select IIO_TRIGGER if IIO_RING_BUFFER

	select IIO_SW_RING if IIO_RING_BUFFER

	select IIO_TRIGGER if IIO_BUFFER

	select IIO_SW_RING if IIO_BUFFER

	help

	  Say yes here to build support for Analog Devices adis16203 Programmable

	  360 Degrees Inclinometer.
@@ -24,8 +24,8 @@ config ADIS16203 
config ADIS16204

	tristate "Analog Devices ADIS16204 Programmable High-g Digital Impact Sensor and Recorder"

	depends on SPI

	select IIO_TRIGGER if IIO_RING_BUFFER

	select IIO_SW_RING if IIO_RING_BUFFER

	select IIO_TRIGGER if IIO_BUFFER

	select IIO_SW_RING if IIO_BUFFER

	help

	  Say yes here to build support for Analog Devices adis16204 Programmable

	  High-g Digital Impact Sensor and Recorder.
@@ -33,8 +33,8 @@ config ADIS16204 
config ADIS16209

	tristate "Analog Devices ADIS16209 Dual-Axis Digital Inclinometer and Accelerometer"

	depends on SPI

	select IIO_TRIGGER if IIO_RING_BUFFER

	select IIO_SW_RING if IIO_RING_BUFFER

	select IIO_TRIGGER if IIO_BUFFER

	select IIO_SW_RING if IIO_BUFFER

	help

	  Say yes here to build support for Analog Devices adis16209 dual-axis digital inclinometer

	  and accelerometer.
@@ -49,8 +49,8 @@ config ADIS16220 
config ADIS16240

	tristate "Analog Devices ADIS16240 Programmable Impact Sensor and Recorder"

	depends on SPI

	select IIO_TRIGGER if IIO_RING_BUFFER

	select IIO_SW_RING if IIO_RING_BUFFER

	select IIO_TRIGGER if IIO_BUFFER

	select IIO_SW_RING if IIO_BUFFER

	help

	  Say yes here to build support for Analog Devices adis16240 programmable

	  impact Sensor and recorder.
@@ -65,8 +65,8 @@ config KXSD9 
config LIS3L02DQ

	tristate "ST Microelectronics LIS3L02DQ Accelerometer Driver"

	depends on SPI

	select IIO_TRIGGER if IIO_RING_BUFFER

	depends on !IIO_RING_BUFFER || IIO_KFIFO_BUF || IIO_SW_RING

	select IIO_TRIGGER if IIO_BUFFER

	depends on !IIO_BUFFER || IIO_KFIFO_BUF || IIO_SW_RING

	help

	  Say yes here to build SPI support for the ST microelectronics

	  accelerometer. The driver supplies direct access via sysfs files
@@ -74,7 +74,7 @@ config LIS3L02DQ 


choice

	prompt "Buffer type"

       	depends on LIS3L02DQ && IIO_RING_BUFFER

       	depends on LIS3L02DQ && IIO_BUFFER



config LIS3L02DQ_BUF_KFIFO

       depends on IIO_KFIFO_BUF
@@ -94,7 +94,7 @@ config LIS3L02DQ_BUF_RING_SW 
endchoice



config SCA3000

	depends on IIO_RING_BUFFER

	depends on IIO_BUFFER

	depends on SPI

	tristate "VTI SCA3000 series accelerometers"

	help

drivers/staging/iio/accel/Makefile

+6 −6
Original line number Diff line number Diff line
@@ -3,32 +3,32 @@ 
#



adis16201-y             := adis16201_core.o

adis16201-$(CONFIG_IIO_RING_BUFFER) += adis16201_ring.o adis16201_trigger.o

adis16201-$(CONFIG_IIO_BUFFER) += adis16201_ring.o adis16201_trigger.o

obj-$(CONFIG_ADIS16201) += adis16201.o



adis16203-y             := adis16203_core.o

adis16203-$(CONFIG_IIO_RING_BUFFER) += adis16203_ring.o adis16203_trigger.o

adis16203-$(CONFIG_IIO_BUFFER) += adis16203_ring.o adis16203_trigger.o

obj-$(CONFIG_ADIS16203) += adis16203.o



adis16204-y             := adis16204_core.o

adis16204-$(CONFIG_IIO_RING_BUFFER) += adis16204_ring.o adis16204_trigger.o

adis16204-$(CONFIG_IIO_BUFFER) += adis16204_ring.o adis16204_trigger.o

obj-$(CONFIG_ADIS16204) += adis16204.o



adis16209-y             := adis16209_core.o

adis16209-$(CONFIG_IIO_RING_BUFFER) += adis16209_ring.o adis16209_trigger.o

adis16209-$(CONFIG_IIO_BUFFER) += adis16209_ring.o adis16209_trigger.o

obj-$(CONFIG_ADIS16209) += adis16209.o



adis16220-y             := adis16220_core.o

obj-$(CONFIG_ADIS16220) += adis16220.o



adis16240-y             := adis16240_core.o

adis16240-$(CONFIG_IIO_RING_BUFFER) += adis16240_ring.o adis16240_trigger.o

adis16240-$(CONFIG_IIO_BUFFER) += adis16240_ring.o adis16240_trigger.o

obj-$(CONFIG_ADIS16240) += adis16240.o



obj-$(CONFIG_KXSD9)	+= kxsd9.o



lis3l02dq-y		:= lis3l02dq_core.o

lis3l02dq-$(CONFIG_IIO_RING_BUFFER) += lis3l02dq_ring.o

lis3l02dq-$(CONFIG_IIO_BUFFER) += lis3l02dq_ring.o

obj-$(CONFIG_LIS3L02DQ)	+= lis3l02dq.o



sca3000-y		:= sca3000_core.o sca3000_ring.o

drivers/staging/iio/accel/adis16201.h

+3 −3
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ enum adis16201_scan { 
	ADIS16201_SCAN_INCLI_Y,

};



#ifdef CONFIG_IIO_RING_BUFFER

#ifdef CONFIG_IIO_BUFFER

void adis16201_remove_trigger(struct iio_dev *indio_dev);

int adis16201_probe_trigger(struct iio_dev *indio_dev);
@@ -100,7 +100,7 @@ ssize_t adis16201_read_data_from_ring(struct device *dev, 
int adis16201_configure_ring(struct iio_dev *indio_dev);

void adis16201_unconfigure_ring(struct iio_dev *indio_dev);



#else /* CONFIG_IIO_RING_BUFFER */

#else /* CONFIG_IIO_BUFFER */



static inline void adis16201_remove_trigger(struct iio_dev *indio_dev)

{
@@ -137,5 +137,5 @@ static inline void adis16201_uninitialize_ring(struct iio_ring_buffer *ring) 
{

}



#endif /* CONFIG_IIO_RING_BUFFER */

#endif /* CONFIG_IIO_BUFFER */

#endif /* SPI_ADIS16201_H_ */