From: Jonathan Cameron <jic23@kernel.org>
To: linux-iio@vger.kernel.org
Cc: Jonathan Cameron <jic23@kernel.org>
Subject: [PATCH 1/7] staging:iio:adc:max1363 ring_sw->kfifo conversion
Date: Sat, 13 Oct 2012 10:34:45 +0100 [thread overview]
Message-ID: <1350120891-28593-2-git-send-email-jic23@kernel.org> (raw)
In-Reply-To: <1350120891-28593-1-git-send-email-jic23@kernel.org>
We are moving towards scrapping ring_sw so this move
is necessary.
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
---
drivers/staging/iio/adc/Kconfig | 2 +-
drivers/staging/iio/adc/max1363_ring.c | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/iio/adc/Kconfig b/drivers/staging/iio/adc/Kconfig
index a525143..0d35ccf 100644
--- a/drivers/staging/iio/adc/Kconfig
+++ b/drivers/staging/iio/adc/Kconfig
@@ -169,7 +169,7 @@ config MAX1363_RING_BUFFER
bool "Maxim max1363: use ring buffer"
depends on MAX1363
select IIO_BUFFER
- select IIO_SW_RING
+ select IIO_KFIFO_BUF
help
Say yes here to include ring buffer support in the MAX1363
ADC driver.
diff --git a/drivers/staging/iio/adc/max1363_ring.c b/drivers/staging/iio/adc/max1363_ring.c
index 688304b..41af17b 100644
--- a/drivers/staging/iio/adc/max1363_ring.c
+++ b/drivers/staging/iio/adc/max1363_ring.c
@@ -16,7 +16,7 @@
#include <linux/iio/iio.h>
#include <linux/iio/buffer.h>
-#include "../ring_sw.h"
+#include <linux/iio/kfifo_buf.h>
#include <linux/iio/trigger_consumer.h>
#include "max1363.h"
@@ -101,7 +101,7 @@ int max1363_register_ring_funcs_and_init(struct iio_dev *indio_dev)
struct max1363_state *st = iio_priv(indio_dev);
int ret = 0;
- indio_dev->buffer = iio_sw_rb_allocate(indio_dev);
+ indio_dev->buffer = iio_kfifo_allocate(indio_dev);
if (!indio_dev->buffer) {
ret = -ENOMEM;
goto error_ret;
@@ -126,7 +126,7 @@ int max1363_register_ring_funcs_and_init(struct iio_dev *indio_dev)
return 0;
error_deallocate_sw_rb:
- iio_sw_rb_free(indio_dev->buffer);
+ iio_kfifo_free(indio_dev->buffer);
error_ret:
return ret;
}
@@ -135,5 +135,5 @@ void max1363_ring_cleanup(struct iio_dev *indio_dev)
{
/* ensure that the trigger has been detached */
iio_dealloc_pollfunc(indio_dev->pollfunc);
- iio_sw_rb_free(indio_dev->buffer);
+ iio_kfifo_free(indio_dev->buffer);
}
--
1.7.12.2
next prev parent reply other threads:[~2012-10-13 9:34 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-13 9:34 [PATCH 0/7] iio:adc:max1363 cleanup and graduation from staging Jonathan Cameron
2012-10-13 9:34 ` Jonathan Cameron [this message]
2012-10-13 9:34 ` [PATCH 2/7] staging:iio:adc:max1363 consolidate files Jonathan Cameron
2012-10-13 9:34 ` [PATCH 3/7] staging:iio:adc:max1363 drop references to 'ring' given now using a fifo Jonathan Cameron
2012-10-13 9:34 ` [PATCH 4/7] staging:iio:adc:max1363 make docs match the contents of max1363_chip_info Jonathan Cameron
2012-10-13 9:34 ` [PATCH 5/7] staging:iio:adc:max1363 white space cleanup Jonathan Cameron
2012-10-13 9:34 ` [PATCH 6/7] staging:iio:adc:max1363 cleanup regulator handling Jonathan Cameron
2012-10-13 9:34 ` [PATCH 7/7] iio:adc:max1363 move from staging 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=1350120891-28593-2-git-send-email-jic23@kernel.org \
--to=jic23@kernel.org \
--cc=linux-iio@vger.kernel.org \
/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).