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

iio: Move generic buffer implementations to sub-directory

For generic IIO trigger implementations we already have a sub-directory,
but the generic buffer implementations currently reside in the IIO
top-level directory. The main reason is that things have historically grown
into this form.

With more generic buffer implementations on its way now is the perfect time
to clean this up and introduce a sub-directory for generic buffer
implementations to avoid too much clutter in the top-level directory.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>

authored by

Lars-Peter Clausen and committed by
Jonathan Cameron
8548a63b 050ee2f1

+35 -26
+1 -1
Documentation/DocBook/iio.tmpl
··· 578 578 work together. 579 579 </para> 580 580 <sect2 id="iiotrigbufsetup"> <title> IIO triggered buffer setup</title> 581 - !Edrivers/iio/industrialio-triggered-buffer.c 581 + !Edrivers/iio/buffer/industrialio-triggered-buffer.c 582 582 !Finclude/linux/iio/iio.h iio_buffer_setup_ops 583 583 584 584
+1 -21
drivers/iio/Kconfig
··· 19 19 acquisition methods. 20 20 21 21 if IIO_BUFFER 22 - 23 - config IIO_BUFFER_CB 24 - tristate "IIO callback buffer used for push in-kernel interfaces" 25 - help 26 - Should be selected by any drivers that do in-kernel push 27 - usage. That is, those where the data is pushed to the consumer. 28 - 29 - config IIO_KFIFO_BUF 30 - tristate "Industrial I/O buffering based on kfifo" 31 - help 32 - A simple fifo based on kfifo. Note that this currently provides 33 - no buffer events so it is up to userspace to work out how 34 - often to read from the buffer. 35 - 36 - config IIO_TRIGGERED_BUFFER 37 - tristate 38 - select IIO_TRIGGER 39 - select IIO_KFIFO_BUF 40 - help 41 - Provides helper functions for setting up triggered buffers. 42 - 22 + source "drivers/iio/buffer/Kconfig" 43 23 endif # IIO_BUFFER 44 24 45 25 config IIO_TRIGGER
+1 -4
drivers/iio/Makefile
··· 7 7 industrialio-$(CONFIG_IIO_BUFFER) += industrialio-buffer.o 8 8 industrialio-$(CONFIG_IIO_TRIGGER) += industrialio-trigger.o 9 9 10 - obj-$(CONFIG_IIO_BUFFER_CB) += industrialio-buffer-cb.o 11 - obj-$(CONFIG_IIO_TRIGGERED_BUFFER) += industrialio-triggered-buffer.o 12 - obj-$(CONFIG_IIO_KFIFO_BUF) += kfifo_buf.o 13 - 14 10 obj-y += accel/ 15 11 obj-y += adc/ 16 12 obj-y += amplifiers/ 13 + obj-y += buffer/ 17 14 obj-y += common/ 18 15 obj-y += dac/ 19 16 obj-y += gyro/
+24
drivers/iio/buffer/Kconfig
··· 1 + # 2 + # Industrial I/O generic buffer implementations 3 + # 4 + # When adding new entries keep the list in alphabetical order 5 + 6 + config IIO_BUFFER_CB 7 + tristate "IIO callback buffer used for push in-kernel interfaces" 8 + help 9 + Should be selected by any drivers that do in-kernel push 10 + usage. That is, those where the data is pushed to the consumer. 11 + 12 + config IIO_KFIFO_BUF 13 + tristate "Industrial I/O buffering based on kfifo" 14 + help 15 + A simple fifo based on kfifo. Note that this currently provides 16 + no buffer events so it is up to userspace to work out how 17 + often to read from the buffer. 18 + 19 + config IIO_TRIGGERED_BUFFER 20 + tristate 21 + select IIO_TRIGGER 22 + select IIO_KFIFO_BUF 23 + help 24 + Provides helper functions for setting up triggered buffers.
+8
drivers/iio/buffer/Makefile
··· 1 + # 2 + # Makefile for the industrial I/O buffer implementations 3 + # 4 + 5 + # When adding new entries keep the list in alphabetical order 6 + obj-$(CONFIG_IIO_BUFFER_CB) += industrialio-buffer-cb.o 7 + obj-$(CONFIG_IIO_TRIGGERED_BUFFER) += industrialio-triggered-buffer.o 8 + obj-$(CONFIG_IIO_KFIFO_BUF) += kfifo_buf.o
drivers/iio/industrialio-buffer-cb.c drivers/iio/buffer/industrialio-buffer-cb.c
drivers/iio/industrialio-triggered-buffer.c drivers/iio/buffer/industrialio-triggered-buffer.c
drivers/iio/kfifo_buf.c drivers/iio/buffer/kfifo_buf.c