* [PATCH 1/2] iio: Move callback buffer to its own module
2015-08-14 14:54 [PATCH 0/2] iio: One more buffer cleanup Lars-Peter Clausen
@ 2015-08-14 14:54 ` Lars-Peter Clausen
2015-08-15 13:50 ` Jonathan Cameron
2015-08-14 14:54 ` [PATCH 2/2] iio: Move generic buffer implementations to sub-directory Lars-Peter Clausen
2015-08-15 13:53 ` [PATCH 0/2] iio: One more buffer cleanup Jonathan Cameron
2 siblings, 1 reply; 6+ messages in thread
From: Lars-Peter Clausen @ 2015-08-14 14:54 UTC (permalink / raw)
To: Jonathan Cameron
Cc: Hartmut Knaack, Peter Meerwald, linux-iio, Lars-Peter Clausen
Currently the IIO callback buffer implementation is directly built into the
IIO core module when enabled. Given that the callback buffer module is
standalone functionallity there is really no reason to do this. So move it
to its own module.
Also rename the source to follow the standard IIO module naming convention
as well as add a license notice to the file.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
drivers/iio/Kconfig | 2 +-
drivers/iio/Makefile | 2 +-
drivers/iio/{buffer_cb.c => industrialio-buffer-cb.c} | 12 ++++++++++++
3 files changed, 14 insertions(+), 2 deletions(-)
rename drivers/iio/{buffer_cb.c => industrialio-buffer-cb.c} (89%)
diff --git a/drivers/iio/Kconfig b/drivers/iio/Kconfig
index 4011eff..b52c8a3 100644
--- a/drivers/iio/Kconfig
+++ b/drivers/iio/Kconfig
@@ -21,7 +21,7 @@ config IIO_BUFFER
if IIO_BUFFER
config IIO_BUFFER_CB
- bool "IIO callback buffer used for push in-kernel interfaces"
+ tristate "IIO callback buffer used for push in-kernel interfaces"
help
Should be selected by any drivers that do in-kernel push
usage. That is, those where the data is pushed to the consumer.
diff --git a/drivers/iio/Makefile b/drivers/iio/Makefile
index 698afc2..09d8ec5 100644
--- a/drivers/iio/Makefile
+++ b/drivers/iio/Makefile
@@ -6,8 +6,8 @@ obj-$(CONFIG_IIO) += industrialio.o
industrialio-y := industrialio-core.o industrialio-event.o inkern.o
industrialio-$(CONFIG_IIO_BUFFER) += industrialio-buffer.o
industrialio-$(CONFIG_IIO_TRIGGER) += industrialio-trigger.o
-industrialio-$(CONFIG_IIO_BUFFER_CB) += buffer_cb.o
+obj-$(CONFIG_IIO_BUFFER_CB) += industrialio-buffer-cb.o
obj-$(CONFIG_IIO_TRIGGERED_BUFFER) += industrialio-triggered-buffer.o
obj-$(CONFIG_IIO_KFIFO_BUF) += kfifo_buf.o
diff --git a/drivers/iio/buffer_cb.c b/drivers/iio/industrialio-buffer-cb.c
similarity index 89%
rename from drivers/iio/buffer_cb.c
rename to drivers/iio/industrialio-buffer-cb.c
index 1648e6e..323079c 100644
--- a/drivers/iio/buffer_cb.c
+++ b/drivers/iio/industrialio-buffer-cb.c
@@ -1,4 +1,12 @@
+/* The industrial I/O callback buffer
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ */
+
#include <linux/kernel.h>
+#include <linux/module.h>
#include <linux/slab.h>
#include <linux/err.h>
#include <linux/export.h>
@@ -124,3 +132,7 @@ struct iio_channel
return cb_buffer->channels;
}
EXPORT_SYMBOL_GPL(iio_channel_cb_get_channels);
+
+MODULE_AUTHOR("Jonathan Cameron <jic23@kernel.org>");
+MODULE_DESCRIPTION("Industrial I/O callback buffer");
+MODULE_LICENSE("GPL");
--
2.1.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 1/2] iio: Move callback buffer to its own module
2015-08-14 14:54 ` [PATCH 1/2] iio: Move callback buffer to its own module Lars-Peter Clausen
@ 2015-08-15 13:50 ` Jonathan Cameron
0 siblings, 0 replies; 6+ messages in thread
From: Jonathan Cameron @ 2015-08-15 13:50 UTC (permalink / raw)
To: Lars-Peter Clausen; +Cc: Hartmut Knaack, Peter Meerwald, linux-iio
On 14/08/15 15:54, Lars-Peter Clausen wrote:
> Currently the IIO callback buffer implementation is directly built into the
> IIO core module when enabled. Given that the callback buffer module is
> standalone functionallity there is really no reason to do this. So move it
> to its own module.
>
> Also rename the source to follow the standard IIO module naming convention
> as well as add a license notice to the file.
>
> Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
I originally kept this in the core because it is so trivial and we
were actually thinking about rolling all the buffers back in to the core
modules at the time (doesn't make sense any more) but I suppose it
is more logical to split it out really ;)
So sure, why not.
Applied to the togreg branch of iio.git - initially pushed out as testing
for the autobuilders to play with it.
> ---
> drivers/iio/Kconfig | 2 +-
> drivers/iio/Makefile | 2 +-
> drivers/iio/{buffer_cb.c => industrialio-buffer-cb.c} | 12 ++++++++++++
> 3 files changed, 14 insertions(+), 2 deletions(-)
> rename drivers/iio/{buffer_cb.c => industrialio-buffer-cb.c} (89%)
>
> diff --git a/drivers/iio/Kconfig b/drivers/iio/Kconfig
> index 4011eff..b52c8a3 100644
> --- a/drivers/iio/Kconfig
> +++ b/drivers/iio/Kconfig
> @@ -21,7 +21,7 @@ config IIO_BUFFER
> if IIO_BUFFER
>
> config IIO_BUFFER_CB
> - bool "IIO callback buffer used for push in-kernel interfaces"
> + tristate "IIO callback buffer used for push in-kernel interfaces"
> help
> Should be selected by any drivers that do in-kernel push
> usage. That is, those where the data is pushed to the consumer.
> diff --git a/drivers/iio/Makefile b/drivers/iio/Makefile
> index 698afc2..09d8ec5 100644
> --- a/drivers/iio/Makefile
> +++ b/drivers/iio/Makefile
> @@ -6,8 +6,8 @@ obj-$(CONFIG_IIO) += industrialio.o
> industrialio-y := industrialio-core.o industrialio-event.o inkern.o
> industrialio-$(CONFIG_IIO_BUFFER) += industrialio-buffer.o
> industrialio-$(CONFIG_IIO_TRIGGER) += industrialio-trigger.o
> -industrialio-$(CONFIG_IIO_BUFFER_CB) += buffer_cb.o
>
> +obj-$(CONFIG_IIO_BUFFER_CB) += industrialio-buffer-cb.o
> obj-$(CONFIG_IIO_TRIGGERED_BUFFER) += industrialio-triggered-buffer.o
> obj-$(CONFIG_IIO_KFIFO_BUF) += kfifo_buf.o
>
> diff --git a/drivers/iio/buffer_cb.c b/drivers/iio/industrialio-buffer-cb.c
> similarity index 89%
> rename from drivers/iio/buffer_cb.c
> rename to drivers/iio/industrialio-buffer-cb.c
> index 1648e6e..323079c 100644
> --- a/drivers/iio/buffer_cb.c
> +++ b/drivers/iio/industrialio-buffer-cb.c
> @@ -1,4 +1,12 @@
> +/* The industrial I/O callback buffer
> + *
> + * This program is free software; you can redistribute it and/or modify it
> + * under the terms of the GNU General Public License version 2 as published by
> + * the Free Software Foundation.
> + */
> +
> #include <linux/kernel.h>
> +#include <linux/module.h>
> #include <linux/slab.h>
> #include <linux/err.h>
> #include <linux/export.h>
> @@ -124,3 +132,7 @@ struct iio_channel
> return cb_buffer->channels;
> }
> EXPORT_SYMBOL_GPL(iio_channel_cb_get_channels);
> +
> +MODULE_AUTHOR("Jonathan Cameron <jic23@kernel.org>");
> +MODULE_DESCRIPTION("Industrial I/O callback buffer");
> +MODULE_LICENSE("GPL");
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/2] iio: Move generic buffer implementations to sub-directory
2015-08-14 14:54 [PATCH 0/2] iio: One more buffer cleanup Lars-Peter Clausen
2015-08-14 14:54 ` [PATCH 1/2] iio: Move callback buffer to its own module Lars-Peter Clausen
@ 2015-08-14 14:54 ` Lars-Peter Clausen
2015-08-15 13:52 ` Jonathan Cameron
2015-08-15 13:53 ` [PATCH 0/2] iio: One more buffer cleanup Jonathan Cameron
2 siblings, 1 reply; 6+ messages in thread
From: Lars-Peter Clausen @ 2015-08-14 14:54 UTC (permalink / raw)
To: Jonathan Cameron
Cc: Hartmut Knaack, Peter Meerwald, linux-iio, Lars-Peter Clausen
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>
---
drivers/iio/Kconfig | 22 +-------------------
drivers/iio/Makefile | 5 +----
drivers/iio/buffer/Kconfig | 24 ++++++++++++++++++++++
drivers/iio/buffer/Makefile | 8 ++++++++
drivers/iio/{ => buffer}/industrialio-buffer-cb.c | 0
.../{ => buffer}/industrialio-triggered-buffer.c | 0
drivers/iio/{ => buffer}/kfifo_buf.c | 0
7 files changed, 34 insertions(+), 25 deletions(-)
create mode 100644 drivers/iio/buffer/Kconfig
create mode 100644 drivers/iio/buffer/Makefile
rename drivers/iio/{ => buffer}/industrialio-buffer-cb.c (100%)
rename drivers/iio/{ => buffer}/industrialio-triggered-buffer.c (100%)
rename drivers/iio/{ => buffer}/kfifo_buf.c (100%)
diff --git a/drivers/iio/Kconfig b/drivers/iio/Kconfig
index b52c8a3..3c6c6e2 100644
--- a/drivers/iio/Kconfig
+++ b/drivers/iio/Kconfig
@@ -19,27 +19,7 @@ config IIO_BUFFER
acquisition methods.
if IIO_BUFFER
-
-config IIO_BUFFER_CB
- tristate "IIO callback buffer used for push in-kernel interfaces"
- help
- Should be selected by any drivers that do in-kernel push
- usage. That is, those where the data is pushed to the consumer.
-
-config IIO_KFIFO_BUF
- tristate "Industrial I/O buffering based on kfifo"
- help
- A simple fifo based on kfifo. Note that this currently provides
- no buffer events so it is up to userspace to work out how
- often to read from the buffer.
-
-config IIO_TRIGGERED_BUFFER
- tristate
- select IIO_TRIGGER
- select IIO_KFIFO_BUF
- help
- Provides helper functions for setting up triggered buffers.
-
+ source "drivers/iio/buffer/Kconfig"
endif # IIO_BUFFER
config IIO_TRIGGER
diff --git a/drivers/iio/Makefile b/drivers/iio/Makefile
index 09d8ec5..7ddb988 100644
--- a/drivers/iio/Makefile
+++ b/drivers/iio/Makefile
@@ -7,13 +7,10 @@ industrialio-y := industrialio-core.o industrialio-event.o inkern.o
industrialio-$(CONFIG_IIO_BUFFER) += industrialio-buffer.o
industrialio-$(CONFIG_IIO_TRIGGER) += industrialio-trigger.o
-obj-$(CONFIG_IIO_BUFFER_CB) += industrialio-buffer-cb.o
-obj-$(CONFIG_IIO_TRIGGERED_BUFFER) += industrialio-triggered-buffer.o
-obj-$(CONFIG_IIO_KFIFO_BUF) += kfifo_buf.o
-
obj-y += accel/
obj-y += adc/
obj-y += amplifiers/
+obj-y += buffer/
obj-y += common/
obj-y += dac/
obj-y += gyro/
diff --git a/drivers/iio/buffer/Kconfig b/drivers/iio/buffer/Kconfig
new file mode 100644
index 0000000..0a7b2fd
--- /dev/null
+++ b/drivers/iio/buffer/Kconfig
@@ -0,0 +1,24 @@
+#
+# Industrial I/O generic buffer implementations
+#
+# When adding new entries keep the list in alphabetical order
+
+config IIO_BUFFER_CB
+ tristate "IIO callback buffer used for push in-kernel interfaces"
+ help
+ Should be selected by any drivers that do in-kernel push
+ usage. That is, those where the data is pushed to the consumer.
+
+config IIO_KFIFO_BUF
+ tristate "Industrial I/O buffering based on kfifo"
+ help
+ A simple fifo based on kfifo. Note that this currently provides
+ no buffer events so it is up to userspace to work out how
+ often to read from the buffer.
+
+config IIO_TRIGGERED_BUFFER
+ tristate
+ select IIO_TRIGGER
+ select IIO_KFIFO_BUF
+ help
+ Provides helper functions for setting up triggered buffers.
diff --git a/drivers/iio/buffer/Makefile b/drivers/iio/buffer/Makefile
new file mode 100644
index 0000000..4d193b9
--- /dev/null
+++ b/drivers/iio/buffer/Makefile
@@ -0,0 +1,8 @@
+#
+# Makefile for the industrial I/O buffer implementations
+#
+
+# When adding new entries keep the list in alphabetical order
+obj-$(CONFIG_IIO_BUFFER_CB) += industrialio-buffer-cb.o
+obj-$(CONFIG_IIO_TRIGGERED_BUFFER) += industrialio-triggered-buffer.o
+obj-$(CONFIG_IIO_KFIFO_BUF) += kfifo_buf.o
diff --git a/drivers/iio/industrialio-buffer-cb.c b/drivers/iio/buffer/industrialio-buffer-cb.c
similarity index 100%
rename from drivers/iio/industrialio-buffer-cb.c
rename to drivers/iio/buffer/industrialio-buffer-cb.c
diff --git a/drivers/iio/industrialio-triggered-buffer.c b/drivers/iio/buffer/industrialio-triggered-buffer.c
similarity index 100%
rename from drivers/iio/industrialio-triggered-buffer.c
rename to drivers/iio/buffer/industrialio-triggered-buffer.c
diff --git a/drivers/iio/kfifo_buf.c b/drivers/iio/buffer/kfifo_buf.c
similarity index 100%
rename from drivers/iio/kfifo_buf.c
rename to drivers/iio/buffer/kfifo_buf.c
--
2.1.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 2/2] iio: Move generic buffer implementations to sub-directory
2015-08-14 14:54 ` [PATCH 2/2] iio: Move generic buffer implementations to sub-directory Lars-Peter Clausen
@ 2015-08-15 13:52 ` Jonathan Cameron
0 siblings, 0 replies; 6+ messages in thread
From: Jonathan Cameron @ 2015-08-15 13:52 UTC (permalink / raw)
To: Lars-Peter Clausen; +Cc: Hartmut Knaack, Peter Meerwald, linux-iio
On 14/08/15 15:54, Lars-Peter Clausen wrote:
> 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>
Makes sense.
Applied to the togreg branch of iio.git - initially pushed out
as testing for the autobuilders to play with it.
Thanks,
Jonathan
> ---
> drivers/iio/Kconfig | 22 +-------------------
> drivers/iio/Makefile | 5 +----
> drivers/iio/buffer/Kconfig | 24 ++++++++++++++++++++++
> drivers/iio/buffer/Makefile | 8 ++++++++
> drivers/iio/{ => buffer}/industrialio-buffer-cb.c | 0
> .../{ => buffer}/industrialio-triggered-buffer.c | 0
> drivers/iio/{ => buffer}/kfifo_buf.c | 0
> 7 files changed, 34 insertions(+), 25 deletions(-)
> create mode 100644 drivers/iio/buffer/Kconfig
> create mode 100644 drivers/iio/buffer/Makefile
> rename drivers/iio/{ => buffer}/industrialio-buffer-cb.c (100%)
> rename drivers/iio/{ => buffer}/industrialio-triggered-buffer.c (100%)
> rename drivers/iio/{ => buffer}/kfifo_buf.c (100%)
>
> diff --git a/drivers/iio/Kconfig b/drivers/iio/Kconfig
> index b52c8a3..3c6c6e2 100644
> --- a/drivers/iio/Kconfig
> +++ b/drivers/iio/Kconfig
> @@ -19,27 +19,7 @@ config IIO_BUFFER
> acquisition methods.
>
> if IIO_BUFFER
> -
> -config IIO_BUFFER_CB
> - tristate "IIO callback buffer used for push in-kernel interfaces"
> - help
> - Should be selected by any drivers that do in-kernel push
> - usage. That is, those where the data is pushed to the consumer.
> -
> -config IIO_KFIFO_BUF
> - tristate "Industrial I/O buffering based on kfifo"
> - help
> - A simple fifo based on kfifo. Note that this currently provides
> - no buffer events so it is up to userspace to work out how
> - often to read from the buffer.
> -
> -config IIO_TRIGGERED_BUFFER
> - tristate
> - select IIO_TRIGGER
> - select IIO_KFIFO_BUF
> - help
> - Provides helper functions for setting up triggered buffers.
> -
> + source "drivers/iio/buffer/Kconfig"
> endif # IIO_BUFFER
>
> config IIO_TRIGGER
> diff --git a/drivers/iio/Makefile b/drivers/iio/Makefile
> index 09d8ec5..7ddb988 100644
> --- a/drivers/iio/Makefile
> +++ b/drivers/iio/Makefile
> @@ -7,13 +7,10 @@ industrialio-y := industrialio-core.o industrialio-event.o inkern.o
> industrialio-$(CONFIG_IIO_BUFFER) += industrialio-buffer.o
> industrialio-$(CONFIG_IIO_TRIGGER) += industrialio-trigger.o
>
> -obj-$(CONFIG_IIO_BUFFER_CB) += industrialio-buffer-cb.o
> -obj-$(CONFIG_IIO_TRIGGERED_BUFFER) += industrialio-triggered-buffer.o
> -obj-$(CONFIG_IIO_KFIFO_BUF) += kfifo_buf.o
> -
> obj-y += accel/
> obj-y += adc/
> obj-y += amplifiers/
> +obj-y += buffer/
> obj-y += common/
> obj-y += dac/
> obj-y += gyro/
> diff --git a/drivers/iio/buffer/Kconfig b/drivers/iio/buffer/Kconfig
> new file mode 100644
> index 0000000..0a7b2fd
> --- /dev/null
> +++ b/drivers/iio/buffer/Kconfig
> @@ -0,0 +1,24 @@
> +#
> +# Industrial I/O generic buffer implementations
> +#
> +# When adding new entries keep the list in alphabetical order
> +
> +config IIO_BUFFER_CB
> + tristate "IIO callback buffer used for push in-kernel interfaces"
> + help
> + Should be selected by any drivers that do in-kernel push
> + usage. That is, those where the data is pushed to the consumer.
> +
> +config IIO_KFIFO_BUF
> + tristate "Industrial I/O buffering based on kfifo"
> + help
> + A simple fifo based on kfifo. Note that this currently provides
> + no buffer events so it is up to userspace to work out how
> + often to read from the buffer.
> +
> +config IIO_TRIGGERED_BUFFER
> + tristate
> + select IIO_TRIGGER
> + select IIO_KFIFO_BUF
> + help
> + Provides helper functions for setting up triggered buffers.
> diff --git a/drivers/iio/buffer/Makefile b/drivers/iio/buffer/Makefile
> new file mode 100644
> index 0000000..4d193b9
> --- /dev/null
> +++ b/drivers/iio/buffer/Makefile
> @@ -0,0 +1,8 @@
> +#
> +# Makefile for the industrial I/O buffer implementations
> +#
> +
> +# When adding new entries keep the list in alphabetical order
> +obj-$(CONFIG_IIO_BUFFER_CB) += industrialio-buffer-cb.o
> +obj-$(CONFIG_IIO_TRIGGERED_BUFFER) += industrialio-triggered-buffer.o
> +obj-$(CONFIG_IIO_KFIFO_BUF) += kfifo_buf.o
> diff --git a/drivers/iio/industrialio-buffer-cb.c b/drivers/iio/buffer/industrialio-buffer-cb.c
> similarity index 100%
> rename from drivers/iio/industrialio-buffer-cb.c
> rename to drivers/iio/buffer/industrialio-buffer-cb.c
> diff --git a/drivers/iio/industrialio-triggered-buffer.c b/drivers/iio/buffer/industrialio-triggered-buffer.c
> similarity index 100%
> rename from drivers/iio/industrialio-triggered-buffer.c
> rename to drivers/iio/buffer/industrialio-triggered-buffer.c
> diff --git a/drivers/iio/kfifo_buf.c b/drivers/iio/buffer/kfifo_buf.c
> similarity index 100%
> rename from drivers/iio/kfifo_buf.c
> rename to drivers/iio/buffer/kfifo_buf.c
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 0/2] iio: One more buffer cleanup
2015-08-14 14:54 [PATCH 0/2] iio: One more buffer cleanup Lars-Peter Clausen
2015-08-14 14:54 ` [PATCH 1/2] iio: Move callback buffer to its own module Lars-Peter Clausen
2015-08-14 14:54 ` [PATCH 2/2] iio: Move generic buffer implementations to sub-directory Lars-Peter Clausen
@ 2015-08-15 13:53 ` Jonathan Cameron
2 siblings, 0 replies; 6+ messages in thread
From: Jonathan Cameron @ 2015-08-15 13:53 UTC (permalink / raw)
To: Lars-Peter Clausen; +Cc: Hartmut Knaack, Peter Meerwald, linux-iio
On 14/08/15 15:54, Lars-Peter Clausen wrote:
> Hi,
>
> One more buffer cleanup moving the generic buffer implementations to a
> common sub-directory before we start adding new generic buffer
> implementations in form of the DMA buffer.
Cool - been looking forward to that for a while :)
J
>
> - Lars
>
> Lars-Peter Clausen (2):
> iio: Move callback buffer to its own module
> iio: Move generic buffer implementations to sub-directory
>
> drivers/iio/Kconfig | 22 +-------------------
> drivers/iio/Makefile | 5 +----
> drivers/iio/buffer/Kconfig | 24 ++++++++++++++++++++++
> drivers/iio/buffer/Makefile | 8 ++++++++
> .../industrialio-buffer-cb.c} | 12 +++++++++++
> .../{ => buffer}/industrialio-triggered-buffer.c | 0
> drivers/iio/{ => buffer}/kfifo_buf.c | 0
> 7 files changed, 46 insertions(+), 25 deletions(-)
> create mode 100644 drivers/iio/buffer/Kconfig
> create mode 100644 drivers/iio/buffer/Makefile
> rename drivers/iio/{buffer_cb.c => buffer/industrialio-buffer-cb.c} (89%)
> rename drivers/iio/{ => buffer}/industrialio-triggered-buffer.c (100%)
> rename drivers/iio/{ => buffer}/kfifo_buf.c (100%)
>
^ permalink raw reply [flat|nested] 6+ messages in thread