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@xxxxxxxxxx>
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@xxxxxxxxxx>");
> +MODULE_DESCRIPTION("Industrial I/O callback buffer");
> +MODULE_LICENSE("GPL");
>
--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
