Skip to content

Commit

Permalink
staging:iio:adc:max1363 ring_sw->kfifo conversion
Browse files Browse the repository at this point in the history
We are moving towards scrapping ring_sw so this move
is necessary.

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
  • Loading branch information
Jonathan Cameron committed Nov 10, 2012
1 parent 92d1079 commit 0d331e4
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion drivers/staging/iio/adc/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,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.
Expand Down
8 changes: 4 additions & 4 deletions drivers/staging/iio/adc/max1363_ring.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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;
Expand All @@ -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;
}
Expand All @@ -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);
}

0 comments on commit 0d331e4

Please sign in to comment.