From: Lars-Peter Clausen <lars@metafoo.de>
To: Jonathan Cameron <jic23@kernel.org>
Cc: Hartmut Knaack <knaack.h@gmx.de>,
Peter Meerwald <pmeerw@pmeerw.net>,
linux-iio@vger.kernel.org, Lars-Peter Clausen <lars@metafoo.de>
Subject: [PATCH 1/2] iio: Move callback buffer to its own module
Date: Fri, 14 Aug 2015 16:54:54 +0200 [thread overview]
Message-ID: <1439564095-7352-2-git-send-email-lars@metafoo.de> (raw)
In-Reply-To: <1439564095-7352-1-git-send-email-lars@metafoo.de>
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
next prev parent reply other threads:[~2015-08-14 14:55 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-14 14:54 [PATCH 0/2] iio: One more buffer cleanup Lars-Peter Clausen
2015-08-14 14:54 ` Lars-Peter Clausen [this message]
2015-08-15 13:50 ` [PATCH 1/2] iio: Move callback buffer to its own module 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:52 ` Jonathan Cameron
2015-08-15 13:53 ` [PATCH 0/2] iio: One more buffer cleanup Jonathan Cameron
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1439564095-7352-2-git-send-email-lars@metafoo.de \
--to=lars@metafoo.de \
--cc=jic23@kernel.org \
--cc=knaack.h@gmx.de \
--cc=linux-iio@vger.kernel.org \
--cc=pmeerw@pmeerw.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).