tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

staging:iio: tree wide IIO_RING_BUFFER config symbol to IIO_BUFFER

Functionality is generic, so name is missleading.

Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

authored by

Jonathan Cameron and committed by
Greg Kroah-Hartman f2a96245 ec3afa40

+89 -89
+3 -3
drivers/staging/iio/Kconfig
··· 12 12 drivers/staging/iio/Documentation for more information. 13 13 if IIO 14 14 15 - config IIO_RING_BUFFER 15 + config IIO_BUFFER 16 16 bool "Enable buffer support within IIO" 17 17 help 18 18 Provide core support for various buffer based data 19 19 acquisition methods. 20 20 21 - if IIO_RING_BUFFER 21 + if IIO_BUFFER 22 22 23 23 config IIO_SW_RING 24 24 select IIO_TRIGGER ··· 38 38 no buffer events so it is up to userspace to work out how 39 39 often to read from the buffer. 40 40 41 - endif # IIO_RINGBUFFER 41 + endif # IIO_BUFFER 42 42 43 43 config IIO_TRIGGER 44 44 boolean "Enable triggered sampling support"
+1 -1
drivers/staging/iio/Makefile
··· 4 4 5 5 obj-$(CONFIG_IIO) += industrialio.o 6 6 industrialio-y := industrialio-core.o 7 - industrialio-$(CONFIG_IIO_RING_BUFFER) += industrialio-ring.o 7 + industrialio-$(CONFIG_IIO_BUFFER) += industrialio-ring.o 8 8 industrialio-$(CONFIG_IIO_TRIGGER) += industrialio-trigger.o 9 9 10 10 obj-$(CONFIG_IIO_SW_RING) += ring_sw.o
+14 -14
drivers/staging/iio/accel/Kconfig
··· 6 6 config ADIS16201 7 7 tristate "Analog Devices ADIS16201 Dual-Axis Digital Inclinometer and Accelerometer" 8 8 depends on SPI 9 - select IIO_TRIGGER if IIO_RING_BUFFER 10 - select IIO_SW_RING if IIO_RING_BUFFER 9 + select IIO_TRIGGER if IIO_BUFFER 10 + select IIO_SW_RING if IIO_BUFFER 11 11 help 12 12 Say yes here to build support for Analog Devices adis16201 dual-axis 13 13 digital inclinometer and accelerometer. ··· 15 15 config ADIS16203 16 16 tristate "Analog Devices ADIS16203 Programmable 360 Degrees Inclinometer" 17 17 depends on SPI 18 - select IIO_TRIGGER if IIO_RING_BUFFER 19 - select IIO_SW_RING if IIO_RING_BUFFER 18 + select IIO_TRIGGER if IIO_BUFFER 19 + select IIO_SW_RING if IIO_BUFFER 20 20 help 21 21 Say yes here to build support for Analog Devices adis16203 Programmable 22 22 360 Degrees Inclinometer. ··· 24 24 config ADIS16204 25 25 tristate "Analog Devices ADIS16204 Programmable High-g Digital Impact Sensor and Recorder" 26 26 depends on SPI 27 - select IIO_TRIGGER if IIO_RING_BUFFER 28 - select IIO_SW_RING if IIO_RING_BUFFER 27 + select IIO_TRIGGER if IIO_BUFFER 28 + select IIO_SW_RING if IIO_BUFFER 29 29 help 30 30 Say yes here to build support for Analog Devices adis16204 Programmable 31 31 High-g Digital Impact Sensor and Recorder. ··· 33 33 config ADIS16209 34 34 tristate "Analog Devices ADIS16209 Dual-Axis Digital Inclinometer and Accelerometer" 35 35 depends on SPI 36 - select IIO_TRIGGER if IIO_RING_BUFFER 37 - select IIO_SW_RING if IIO_RING_BUFFER 36 + select IIO_TRIGGER if IIO_BUFFER 37 + select IIO_SW_RING if IIO_BUFFER 38 38 help 39 39 Say yes here to build support for Analog Devices adis16209 dual-axis digital inclinometer 40 40 and accelerometer. ··· 49 49 config ADIS16240 50 50 tristate "Analog Devices ADIS16240 Programmable Impact Sensor and Recorder" 51 51 depends on SPI 52 - select IIO_TRIGGER if IIO_RING_BUFFER 53 - select IIO_SW_RING if IIO_RING_BUFFER 52 + select IIO_TRIGGER if IIO_BUFFER 53 + select IIO_SW_RING if IIO_BUFFER 54 54 help 55 55 Say yes here to build support for Analog Devices adis16240 programmable 56 56 impact Sensor and recorder. ··· 65 65 config LIS3L02DQ 66 66 tristate "ST Microelectronics LIS3L02DQ Accelerometer Driver" 67 67 depends on SPI 68 - select IIO_TRIGGER if IIO_RING_BUFFER 69 - depends on !IIO_RING_BUFFER || IIO_KFIFO_BUF || IIO_SW_RING 68 + select IIO_TRIGGER if IIO_BUFFER 69 + depends on !IIO_BUFFER || IIO_KFIFO_BUF || IIO_SW_RING 70 70 help 71 71 Say yes here to build SPI support for the ST microelectronics 72 72 accelerometer. The driver supplies direct access via sysfs files ··· 74 74 75 75 choice 76 76 prompt "Buffer type" 77 - depends on LIS3L02DQ && IIO_RING_BUFFER 77 + depends on LIS3L02DQ && IIO_BUFFER 78 78 79 79 config LIS3L02DQ_BUF_KFIFO 80 80 depends on IIO_KFIFO_BUF ··· 94 94 endchoice 95 95 96 96 config SCA3000 97 - depends on IIO_RING_BUFFER 97 + depends on IIO_BUFFER 98 98 depends on SPI 99 99 tristate "VTI SCA3000 series accelerometers" 100 100 help
+6 -6
drivers/staging/iio/accel/Makefile
··· 3 3 # 4 4 5 5 adis16201-y := adis16201_core.o 6 - adis16201-$(CONFIG_IIO_RING_BUFFER) += adis16201_ring.o adis16201_trigger.o 6 + adis16201-$(CONFIG_IIO_BUFFER) += adis16201_ring.o adis16201_trigger.o 7 7 obj-$(CONFIG_ADIS16201) += adis16201.o 8 8 9 9 adis16203-y := adis16203_core.o 10 - adis16203-$(CONFIG_IIO_RING_BUFFER) += adis16203_ring.o adis16203_trigger.o 10 + adis16203-$(CONFIG_IIO_BUFFER) += adis16203_ring.o adis16203_trigger.o 11 11 obj-$(CONFIG_ADIS16203) += adis16203.o 12 12 13 13 adis16204-y := adis16204_core.o 14 - adis16204-$(CONFIG_IIO_RING_BUFFER) += adis16204_ring.o adis16204_trigger.o 14 + adis16204-$(CONFIG_IIO_BUFFER) += adis16204_ring.o adis16204_trigger.o 15 15 obj-$(CONFIG_ADIS16204) += adis16204.o 16 16 17 17 adis16209-y := adis16209_core.o 18 - adis16209-$(CONFIG_IIO_RING_BUFFER) += adis16209_ring.o adis16209_trigger.o 18 + adis16209-$(CONFIG_IIO_BUFFER) += adis16209_ring.o adis16209_trigger.o 19 19 obj-$(CONFIG_ADIS16209) += adis16209.o 20 20 21 21 adis16220-y := adis16220_core.o 22 22 obj-$(CONFIG_ADIS16220) += adis16220.o 23 23 24 24 adis16240-y := adis16240_core.o 25 - adis16240-$(CONFIG_IIO_RING_BUFFER) += adis16240_ring.o adis16240_trigger.o 25 + adis16240-$(CONFIG_IIO_BUFFER) += adis16240_ring.o adis16240_trigger.o 26 26 obj-$(CONFIG_ADIS16240) += adis16240.o 27 27 28 28 obj-$(CONFIG_KXSD9) += kxsd9.o 29 29 30 30 lis3l02dq-y := lis3l02dq_core.o 31 - lis3l02dq-$(CONFIG_IIO_RING_BUFFER) += lis3l02dq_ring.o 31 + lis3l02dq-$(CONFIG_IIO_BUFFER) += lis3l02dq_ring.o 32 32 obj-$(CONFIG_LIS3L02DQ) += lis3l02dq.o 33 33 34 34 sca3000-y := sca3000_core.o sca3000_ring.o
+3 -3
drivers/staging/iio/accel/adis16201.h
··· 89 89 ADIS16201_SCAN_INCLI_Y, 90 90 }; 91 91 92 - #ifdef CONFIG_IIO_RING_BUFFER 92 + #ifdef CONFIG_IIO_BUFFER 93 93 void adis16201_remove_trigger(struct iio_dev *indio_dev); 94 94 int adis16201_probe_trigger(struct iio_dev *indio_dev); 95 95 ··· 100 100 int adis16201_configure_ring(struct iio_dev *indio_dev); 101 101 void adis16201_unconfigure_ring(struct iio_dev *indio_dev); 102 102 103 - #else /* CONFIG_IIO_RING_BUFFER */ 103 + #else /* CONFIG_IIO_BUFFER */ 104 104 105 105 static inline void adis16201_remove_trigger(struct iio_dev *indio_dev) 106 106 { ··· 137 137 { 138 138 } 139 139 140 - #endif /* CONFIG_IIO_RING_BUFFER */ 140 + #endif /* CONFIG_IIO_BUFFER */ 141 141 #endif /* SPI_ADIS16201_H_ */
+3 -3
drivers/staging/iio/accel/adis16203.h
··· 82 82 ADIS16203_SCAN_INCLI_Y, 83 83 }; 84 84 85 - #ifdef CONFIG_IIO_RING_BUFFER 85 + #ifdef CONFIG_IIO_BUFFER 86 86 void adis16203_remove_trigger(struct iio_dev *indio_dev); 87 87 int adis16203_probe_trigger(struct iio_dev *indio_dev); 88 88 ··· 93 93 int adis16203_configure_ring(struct iio_dev *indio_dev); 94 94 void adis16203_unconfigure_ring(struct iio_dev *indio_dev); 95 95 96 - #else /* CONFIG_IIO_RING_BUFFER */ 96 + #else /* CONFIG_IIO_BUFFER */ 97 97 98 98 static inline void adis16203_remove_trigger(struct iio_dev *indio_dev) 99 99 { ··· 121 121 { 122 122 } 123 123 124 - #endif /* CONFIG_IIO_RING_BUFFER */ 124 + #endif /* CONFIG_IIO_BUFFER */ 125 125 #endif /* SPI_ADIS16203_H_ */
+3 -3
drivers/staging/iio/accel/adis16204.h
··· 90 90 ADIS16204_SCAN_TEMP, 91 91 }; 92 92 93 - #ifdef CONFIG_IIO_RING_BUFFER 93 + #ifdef CONFIG_IIO_BUFFER 94 94 void adis16204_remove_trigger(struct iio_dev *indio_dev); 95 95 int adis16204_probe_trigger(struct iio_dev *indio_dev); 96 96 ··· 101 101 int adis16204_configure_ring(struct iio_dev *indio_dev); 102 102 void adis16204_unconfigure_ring(struct iio_dev *indio_dev); 103 103 104 - #else /* CONFIG_IIO_RING_BUFFER */ 104 + #else /* CONFIG_IIO_BUFFER */ 105 105 106 106 static inline void adis16204_remove_trigger(struct iio_dev *indio_dev) 107 107 { ··· 129 129 { 130 130 } 131 131 132 - #endif /* CONFIG_IIO_RING_BUFFER */ 132 + #endif /* CONFIG_IIO_BUFFER */ 133 133 #endif /* SPI_ADIS16204_H_ */
+3 -3
drivers/staging/iio/accel/adis16209.h
··· 128 128 #define ADIS16209_SCAN_INCLI_Y 6 129 129 #define ADIS16209_SCAN_ROT 7 130 130 131 - #ifdef CONFIG_IIO_RING_BUFFER 131 + #ifdef CONFIG_IIO_BUFFER 132 132 133 133 void adis16209_remove_trigger(struct iio_dev *indio_dev); 134 134 int adis16209_probe_trigger(struct iio_dev *indio_dev); ··· 140 140 int adis16209_configure_ring(struct iio_dev *indio_dev); 141 141 void adis16209_unconfigure_ring(struct iio_dev *indio_dev); 142 142 143 - #else /* CONFIG_IIO_RING_BUFFER */ 143 + #else /* CONFIG_IIO_BUFFER */ 144 144 145 145 static inline void adis16209_remove_trigger(struct iio_dev *indio_dev) 146 146 { ··· 168 168 { 169 169 } 170 170 171 - #endif /* CONFIG_IIO_RING_BUFFER */ 171 + #endif /* CONFIG_IIO_BUFFER */ 172 172 #endif /* SPI_ADIS16209_H_ */
+3 -3
drivers/staging/iio/accel/adis16240.h
··· 152 152 #define ADIS16240_SCAN_AUX_ADC 4 153 153 #define ADIS16240_SCAN_TEMP 5 154 154 155 - #ifdef CONFIG_IIO_RING_BUFFER 155 + #ifdef CONFIG_IIO_BUFFER 156 156 void adis16240_remove_trigger(struct iio_dev *indio_dev); 157 157 int adis16240_probe_trigger(struct iio_dev *indio_dev); 158 158 ··· 164 164 int adis16240_configure_ring(struct iio_dev *indio_dev); 165 165 void adis16240_unconfigure_ring(struct iio_dev *indio_dev); 166 166 167 - #else /* CONFIG_IIO_RING_BUFFER */ 167 + #else /* CONFIG_IIO_BUFFER */ 168 168 169 169 static inline void adis16240_remove_trigger(struct iio_dev *indio_dev) 170 170 { ··· 192 192 { 193 193 } 194 194 195 - #endif /* CONFIG_IIO_RING_BUFFER */ 195 + #endif /* CONFIG_IIO_BUFFER */ 196 196 #endif /* SPI_ADIS16240_H_ */
+3 -3
drivers/staging/iio/accel/lis3l02dq.h
··· 174 174 175 175 int lis3l02dq_disable_all_events(struct iio_dev *indio_dev); 176 176 177 - #ifdef CONFIG_IIO_RING_BUFFER 177 + #ifdef CONFIG_IIO_BUFFER 178 178 /* At the moment triggers are only used for ring buffer 179 179 * filling. This may change! 180 180 */ ··· 202 202 irqreturn_t lis3l02dq_data_rdy_trig_poll(int irq, void *private); 203 203 #define lis3l02dq_th lis3l02dq_data_rdy_trig_poll 204 204 205 - #else /* CONFIG_IIO_RING_BUFFER */ 205 + #else /* CONFIG_IIO_BUFFER */ 206 206 #define lis3l02dq_th lis3l02dq_noring 207 207 208 208 static inline void lis3l02dq_remove_trigger(struct iio_dev *indio_dev) ··· 227 227 static inline void lis3l02dq_unconfigure_ring(struct iio_dev *indio_dev) 228 228 { 229 229 } 230 - #endif /* CONFIG_IIO_RING_BUFFER */ 230 + #endif /* CONFIG_IIO_BUFFER */ 231 231 #endif /* SPI_LIS3L02DQ_H_ */
+1 -1
drivers/staging/iio/accel/lis3l02dq_core.c
··· 34 34 * This means that use cannot be made of spi_write etc. 35 35 */ 36 36 /* direct copy of the irq_default_primary_handler */ 37 - #ifndef CONFIG_IIO_RING_BUFFER 37 + #ifndef CONFIG_IIO_BUFFER 38 38 static irqreturn_t lis3l02dq_noring(int irq, void *private) 39 39 { 40 40 return IRQ_WAKE_THREAD;
+1 -1
drivers/staging/iio/accel/sca3000.h
··· 221 221 **/ 222 222 int sca3000_write_reg(struct sca3000_state *st, u8 address, u8 val); 223 223 224 - #ifdef CONFIG_IIO_RING_BUFFER 224 + #ifdef CONFIG_IIO_BUFFER 225 225 /** 226 226 * sca3000_register_ring_funcs() setup the ring state change functions 227 227 **/
+9 -9
drivers/staging/iio/adc/Kconfig
··· 44 44 config AD7606 45 45 tristate "Analog Devices AD7606 ADC driver" 46 46 depends on GPIOLIB 47 - select IIO_RING_BUFFER 47 + select IIO_BUFFER 48 48 select IIO_TRIGGER 49 49 select IIO_SW_RING 50 50 help ··· 72 72 config AD799X 73 73 tristate "Analog Devices AD799x ADC driver" 74 74 depends on I2C 75 - select IIO_TRIGGER if IIO_RING_BUFFER 75 + select IIO_TRIGGER if IIO_BUFFER 76 76 select AD799X_RING_BUFFER 77 77 help 78 78 Say yes here to build support for Analog Devices: ··· 83 83 config AD799X_RING_BUFFER 84 84 bool "Analog Devices AD799x: use ring buffer" 85 85 depends on AD799X 86 - select IIO_RING_BUFFER 86 + select IIO_BUFFER 87 87 select IIO_SW_RING 88 88 help 89 89 Say yes here to include ring buffer support in the AD799X ··· 92 92 config AD7476 93 93 tristate "Analog Devices AD7475/6/7/8 AD7466/7/8 and AD7495 ADC driver" 94 94 depends on SPI 95 - select IIO_RING_BUFFER 95 + select IIO_BUFFER 96 96 select IIO_SW_RING 97 97 select IIO_TRIGGER 98 98 help ··· 107 107 config AD7887 108 108 tristate "Analog Devices AD7887 ADC driver" 109 109 depends on SPI 110 - select IIO_RING_BUFFER 110 + select IIO_BUFFER 111 111 select IIO_SW_RING 112 112 select IIO_TRIGGER 113 113 help ··· 133 133 config AD7793 134 134 tristate "Analog Devices AD7792 AD7793 ADC driver" 135 135 depends on SPI 136 - select IIO_RING_BUFFER 136 + select IIO_BUFFER 137 137 select IIO_SW_RING 138 138 select IIO_TRIGGER 139 139 help ··· 164 164 config AD7192 165 165 tristate "Analog Devices AD7190 AD7192 AD7195 ADC driver" 166 166 depends on SPI 167 - select IIO_RING_BUFFER 167 + select IIO_BUFFER 168 168 select IIO_SW_RING 169 169 select IIO_TRIGGER 170 170 help ··· 209 209 config MAX1363 210 210 tristate "Maxim max1363 ADC driver" 211 211 depends on I2C 212 - select IIO_TRIGGER if IIO_RING_BUFFER 212 + select IIO_TRIGGER if IIO_BUFFER 213 213 select MAX1363_RING_BUFFER 214 214 help 215 215 Say yes here to build support for many Maxim i2c analog to digital ··· 224 224 config MAX1363_RING_BUFFER 225 225 bool "Maxim max1363: use ring buffer" 226 226 depends on MAX1363 227 - select IIO_RING_BUFFER 227 + select IIO_BUFFER 228 228 select IIO_SW_RING 229 229 help 230 230 Say yes here to include ring buffer support in the MAX1363
+4 -4
drivers/staging/iio/adc/Makefile
··· 8 8 obj-$(CONFIG_MAX1363) += max1363.o 9 9 10 10 ad7606-y := ad7606_core.o 11 - ad7606-$(CONFIG_IIO_RING_BUFFER) += ad7606_ring.o 11 + ad7606-$(CONFIG_IIO_BUFFER) += ad7606_ring.o 12 12 ad7606-$(CONFIG_AD7606_IFACE_PARALLEL) += ad7606_par.o 13 13 ad7606-$(CONFIG_AD7606_IFACE_SPI) += ad7606_spi.o 14 14 obj-$(CONFIG_AD7606) += ad7606.o ··· 18 18 obj-$(CONFIG_AD799X) += ad799x.o 19 19 20 20 ad7476-y := ad7476_core.o 21 - ad7476-$(CONFIG_IIO_RING_BUFFER) += ad7476_ring.o 21 + ad7476-$(CONFIG_IIO_BUFFER) += ad7476_ring.o 22 22 obj-$(CONFIG_AD7476) += ad7476.o 23 23 24 24 ad7887-y := ad7887_core.o 25 - ad7887-$(CONFIG_IIO_RING_BUFFER) += ad7887_ring.o 25 + ad7887-$(CONFIG_IIO_BUFFER) += ad7887_ring.o 26 26 obj-$(CONFIG_AD7887) += ad7887.o 27 27 28 28 ad7298-y := ad7298_core.o 29 - ad7298-$(CONFIG_IIO_RING_BUFFER) += ad7298_ring.o 29 + ad7298-$(CONFIG_IIO_BUFFER) += ad7298_ring.o 30 30 obj-$(CONFIG_AD7298) += ad7298.o 31 31 32 32 obj-$(CONFIG_AD7150) += ad7150.o
+3 -3
drivers/staging/iio/adc/ad7298.h
··· 53 53 unsigned short tx_buf[2]; 54 54 }; 55 55 56 - #ifdef CONFIG_IIO_RING_BUFFER 56 + #ifdef CONFIG_IIO_BUFFER 57 57 int ad7298_scan_from_ring(struct iio_dev *indio_dev, long ch); 58 58 int ad7298_register_ring_funcs_and_init(struct iio_dev *indio_dev); 59 59 void ad7298_ring_cleanup(struct iio_dev *indio_dev); 60 - #else /* CONFIG_IIO_RING_BUFFER */ 60 + #else /* CONFIG_IIO_BUFFER */ 61 61 static inline int ad7298_scan_from_ring(struct iio_dev *indio_dev, long ch) 62 62 { 63 63 return 0; ··· 72 72 static inline void ad7298_ring_cleanup(struct iio_dev *indio_dev) 73 73 { 74 74 } 75 - #endif /* CONFIG_IIO_RING_BUFFER */ 75 + #endif /* CONFIG_IIO_BUFFER */ 76 76 #endif /* IIO_ADC_AD7298_H_ */
+3 -3
drivers/staging/iio/adc/ad7476.h
··· 49 49 ID_AD7495 50 50 }; 51 51 52 - #ifdef CONFIG_IIO_RING_BUFFER 52 + #ifdef CONFIG_IIO_BUFFER 53 53 int ad7476_scan_from_ring(struct iio_dev *indio_dev); 54 54 int ad7476_register_ring_funcs_and_init(struct iio_dev *indio_dev); 55 55 void ad7476_ring_cleanup(struct iio_dev *indio_dev); 56 - #else /* CONFIG_IIO_RING_BUFFER */ 56 + #else /* CONFIG_IIO_BUFFER */ 57 57 static inline int ad7476_scan_from_ring(struct iio_dev *indio_dev) 58 58 { 59 59 return 0; ··· 68 68 static inline void ad7476_ring_cleanup(struct iio_dev *indio_dev) 69 69 { 70 70 } 71 - #endif /* CONFIG_IIO_RING_BUFFER */ 71 + #endif /* CONFIG_IIO_BUFFER */ 72 72 #endif /* IIO_ADC_AD7476_H_ */
+3 -3
drivers/staging/iio/adc/ad7887.h
··· 82 82 ID_AD7887 83 83 }; 84 84 85 - #ifdef CONFIG_IIO_RING_BUFFER 85 + #ifdef CONFIG_IIO_BUFFER 86 86 int ad7887_scan_from_ring(struct ad7887_state *st, int channum); 87 87 int ad7887_register_ring_funcs_and_init(struct iio_dev *indio_dev); 88 88 void ad7887_ring_cleanup(struct iio_dev *indio_dev); 89 - #else /* CONFIG_IIO_RING_BUFFER */ 89 + #else /* CONFIG_IIO_BUFFER */ 90 90 static inline int ad7887_scan_from_ring(struct ad7887_state *st, int channum) 91 91 { 92 92 return 0; ··· 101 101 static inline void ad7887_ring_cleanup(struct iio_dev *indio_dev) 102 102 { 103 103 } 104 - #endif /* CONFIG_IIO_RING_BUFFER */ 104 + #endif /* CONFIG_IIO_BUFFER */ 105 105 #endif /* IIO_ADC_AD7887_H_ */
+2 -2
drivers/staging/iio/gyro/Kconfig
··· 27 27 config ADIS16260 28 28 tristate "Analog Devices ADIS16260 Digital Gyroscope Sensor SPI driver" 29 29 depends on SPI 30 - select IIO_TRIGGER if IIO_RING_BUFFER 31 - select IIO_SW_RING if IIO_RING_BUFFER 30 + select IIO_TRIGGER if IIO_BUFFER 31 + select IIO_SW_RING if IIO_BUFFER 32 32 help 33 33 Say yes here to build support for Analog Devices ADIS16260 ADIS16265 34 34 ADIS16250 ADIS16255 and ADIS16251 programmable digital gyroscope sensors.
+1 -1
drivers/staging/iio/gyro/Makefile
··· 12 12 obj-$(CONFIG_ADIS16130) += adis16130.o 13 13 14 14 adis16260-y := adis16260_core.o 15 - adis16260-$(CONFIG_IIO_RING_BUFFER) += adis16260_ring.o adis16260_trigger.o 15 + adis16260-$(CONFIG_IIO_BUFFER) += adis16260_ring.o adis16260_trigger.o 16 16 obj-$(CONFIG_ADIS16260) += adis16260.o 17 17 18 18 adis16251-y := adis16251_core.o
+3 -3
drivers/staging/iio/gyro/adis16260.h
··· 112 112 #define ADIS16260_SCAN_TEMP 3 113 113 #define ADIS16260_SCAN_ANGL 4 114 114 115 - #ifdef CONFIG_IIO_RING_BUFFER 115 + #ifdef CONFIG_IIO_BUFFER 116 116 void adis16260_remove_trigger(struct iio_dev *indio_dev); 117 117 int adis16260_probe_trigger(struct iio_dev *indio_dev); 118 118 ··· 124 124 int adis16260_configure_ring(struct iio_dev *indio_dev); 125 125 void adis16260_unconfigure_ring(struct iio_dev *indio_dev); 126 126 127 - #else /* CONFIG_IIO_RING_BUFFER */ 127 + #else /* CONFIG_IIO_BUFFER */ 128 128 129 129 static inline void adis16260_remove_trigger(struct iio_dev *indio_dev) 130 130 { ··· 152 152 { 153 153 } 154 154 155 - #endif /* CONFIG_IIO_RING_BUFFER */ 155 + #endif /* CONFIG_IIO_BUFFER */ 156 156 #endif /* SPI_ADIS16260_H_ */
+1 -1
drivers/staging/iio/iio_core.h
··· 30 30 /* Event interface flags */ 31 31 #define IIO_BUSY_BIT_POS 1 32 32 33 - #ifdef CONFIG_IIO_RING_BUFFER 33 + #ifdef CONFIG_IIO_BUFFER 34 34 struct poll_table_struct; 35 35 36 36 void iio_chrdev_ring_open(struct iio_dev *indio_dev);
+1 -1
drivers/staging/iio/impedance-analyzer/Kconfig
··· 6 6 config AD5933 7 7 tristate "Analog Devices AD5933, AD5934 driver" 8 8 depends on I2C 9 - select IIO_RING_BUFFER 9 + select IIO_BUFFER 10 10 select IIO_SW_RING 11 11 help 12 12 Say yes here to build support for Analog Devices Impedance Converter,
+2 -2
drivers/staging/iio/imu/Kconfig
··· 6 6 config ADIS16400 7 7 tristate "Analog Devices ADIS16400 and similar IMU SPI driver" 8 8 depends on SPI 9 - select IIO_SW_RING if IIO_RING_BUFFER 10 - select IIO_TRIGGER if IIO_RING_BUFFER 9 + select IIO_SW_RING if IIO_BUFFER 10 + select IIO_TRIGGER if IIO_BUFFER 11 11 help 12 12 Say yes here to build support for Analog Devices adis16300, adis16350, 13 13 adis16354, adis16355, adis16360, adis16362, adis16364, adis16365,
+1 -1
drivers/staging/iio/imu/Makefile
··· 3 3 # 4 4 5 5 adis16400-y := adis16400_core.o 6 - adis16400-$(CONFIG_IIO_RING_BUFFER) += adis16400_ring.o adis16400_trigger.o 6 + adis16400-$(CONFIG_IIO_BUFFER) += adis16400_ring.o adis16400_trigger.o 7 7 obj-$(CONFIG_ADIS16400) += adis16400.o
+3 -3
drivers/staging/iio/imu/adis16400.h
··· 184 184 #define ADIS16300_SCAN_INCLI_X 12 185 185 #define ADIS16300_SCAN_INCLI_Y 13 186 186 187 - #ifdef CONFIG_IIO_RING_BUFFER 187 + #ifdef CONFIG_IIO_BUFFER 188 188 void adis16400_remove_trigger(struct iio_dev *indio_dev); 189 189 int adis16400_probe_trigger(struct iio_dev *indio_dev); 190 190 ··· 196 196 int adis16400_configure_ring(struct iio_dev *indio_dev); 197 197 void adis16400_unconfigure_ring(struct iio_dev *indio_dev); 198 198 199 - #else /* CONFIG_IIO_RING_BUFFER */ 199 + #else /* CONFIG_IIO_BUFFER */ 200 200 201 201 static inline void adis16400_remove_trigger(struct iio_dev *indio_dev) 202 202 { ··· 224 224 { 225 225 } 226 226 227 - #endif /* CONFIG_IIO_RING_BUFFER */ 227 + #endif /* CONFIG_IIO_BUFFER */ 228 228 #endif /* SPI_ADIS16400_H_ */
+2 -2
drivers/staging/iio/meter/Kconfig
··· 20 20 config ADE7758 21 21 tristate "Analog Devices ADE7758 Poly Phase Multifunction Energy Metering IC Driver" 22 22 depends on SPI 23 - select IIO_TRIGGER if IIO_RING_BUFFER 24 - select IIO_SW_RING if IIO_RING_BUFFER 23 + select IIO_TRIGGER if IIO_BUFFER 24 + select IIO_SW_RING if IIO_BUFFER 25 25 help 26 26 Say yes here to build support for Analog Devices ADE7758 Polyphase 27 27 Multifunction Energy Metering IC with Per Phase Information Driver.
+1 -1
drivers/staging/iio/meter/Makefile
··· 6 6 obj-$(CONFIG_ADE7754) += ade7754.o 7 7 8 8 ade7758-y := ade7758_core.o 9 - ade7758-$(CONFIG_IIO_RING_BUFFER) += ade7758_ring.o ade7758_trigger.o 9 + ade7758-$(CONFIG_IIO_BUFFER) += ade7758_ring.o ade7758_trigger.o 10 10 obj-$(CONFIG_ADE7758) += ade7758.o 11 11 12 12 obj-$(CONFIG_ADE7759) += ade7759.o
+3 -3
drivers/staging/iio/meter/ade7758.h
··· 134 134 unsigned char tx_buf[8]; 135 135 136 136 }; 137 - #ifdef CONFIG_IIO_RING_BUFFER 137 + #ifdef CONFIG_IIO_BUFFER 138 138 /* At the moment triggers are only used for ring buffer 139 139 * filling. This may change! 140 140 */ ··· 158 158 int ade7758_spi_read_reg_8(struct device *dev, 159 159 u8 reg_address, u8 *val); 160 160 161 - #else /* CONFIG_IIO_RING_BUFFER */ 161 + #else /* CONFIG_IIO_BUFFER */ 162 162 163 163 static inline void ade7758_remove_trigger(struct iio_dev *indio_dev) 164 164 { ··· 182 182 static inline void ade7758_uninitialize_ring(struct iio_dev *indio_dev) 183 183 { 184 184 } 185 - #endif /* CONFIG_IIO_RING_BUFFER */ 185 + #endif /* CONFIG_IIO_BUFFER */ 186 186 187 187 #endif
+3 -3
drivers/staging/iio/ring_generic.h
··· 13 13 #include "iio.h" 14 14 #include "chrdev.h" 15 15 16 - #ifdef CONFIG_IIO_RING_BUFFER 16 + #ifdef CONFIG_IIO_BUFFER 17 17 18 18 struct iio_ring_buffer; 19 19 ··· 209 209 210 210 int iio_sw_ring_preenable(struct iio_dev *indio_dev); 211 211 212 - #else /* CONFIG_IIO_RING_BUFFER */ 212 + #else /* CONFIG_IIO_BUFFER */ 213 213 214 214 static inline int iio_ring_buffer_register(struct iio_dev *indio_dev, 215 215 struct iio_chan_spec *channels, ··· 221 221 static inline void iio_ring_buffer_unregister(struct iio_dev *indio_dev) 222 222 {}; 223 223 224 - #endif /* CONFIG_IIO_RING_BUFFER */ 224 + #endif /* CONFIG_IIO_BUFFER */ 225 225 226 226 #endif /* _IIO_RING_GENERIC_H_ */