Skip to content

L
linux
Commit 14555b14 authored by Jonathan Cameron's avatar Jonathan Cameron Committed by Greg Kroah-Hartman
Browse files
Options

staging:iio: replacing term ring with buffer in the IIO core. 

They aren't always ring buffers, so just use buffer for all naming.
Signed-off-by: default avatarJonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 3811cd62
Hide whitespace changes
Inline Side-by-side
Showing with 680 additions and 678 deletions
drivers/staging/iio/Makefile
View file @ 14555b14
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
obj-$(CONFIG_IIO) += industrialio.o obj-$(CONFIG_IIO) += industrialio.o
industrialio-y := industrialio-core.o industrialio-y := industrialio-core.o
industrialio-$(CONFIG_IIO_BUFFER) += industrialio-ring.o industrialio-$(CONFIG_IIO_BUFFER) += industrialio-buffer.o
industrialio-$(CONFIG_IIO_TRIGGER) += industrialio-trigger.o industrialio-$(CONFIG_IIO_TRIGGER) += industrialio-trigger.o
obj-$(CONFIG_IIO_SW_RING) += ring_sw.o obj-$(CONFIG_IIO_SW_RING) += ring_sw.o
......
drivers/staging/iio/accel/adis16201_core.c
View file @ 14555b14
...@@ -492,9 +492,9 @@ static int __devinit adis16201_probe(struct spi_device *spi) ...@@ -492,9 +492,9 @@ static int __devinit adis16201_probe(struct spi_device *spi)
if (ret) if (ret)
goto error_free_dev; goto error_free_dev;
ret = iio_ring_buffer_register(indio_dev, ret = iio_buffer_register(indio_dev,
adis16201_channels, adis16201_channels,
ARRAY_SIZE(adis16201_channels)); ARRAY_SIZE(adis16201_channels));
if (ret) { if (ret) {
printk(KERN_ERR "failed to initialize the ring\n"); printk(KERN_ERR "failed to initialize the ring\n");
goto error_unreg_ring_funcs; goto error_unreg_ring_funcs;
...@@ -519,7 +519,7 @@ static int __devinit adis16201_probe(struct spi_device *spi) ...@@ -519,7 +519,7 @@ static int __devinit adis16201_probe(struct spi_device *spi)
error_remove_trigger: error_remove_trigger:
adis16201_remove_trigger(indio_dev); adis16201_remove_trigger(indio_dev);
error_uninitialize_ring: error_uninitialize_ring:
iio_ring_buffer_unregister(indio_dev); iio_buffer_unregister(indio_dev);
error_unreg_ring_funcs: error_unreg_ring_funcs:
adis16201_unconfigure_ring(indio_dev); adis16201_unconfigure_ring(indio_dev);
error_free_dev: error_free_dev:
...@@ -533,7 +533,7 @@ static int adis16201_remove(struct spi_device *spi) ...@@ -533,7 +533,7 @@ static int adis16201_remove(struct spi_device *spi)
struct iio_dev *indio_dev = spi_get_drvdata(spi); struct iio_dev *indio_dev = spi_get_drvdata(spi);
adis16201_remove_trigger(indio_dev); adis16201_remove_trigger(indio_dev);
iio_ring_buffer_unregister(indio_dev); iio_buffer_unregister(indio_dev);
adis16201_unconfigure_ring(indio_dev); adis16201_unconfigure_ring(indio_dev);
iio_device_unregister(indio_dev); iio_device_unregister(indio_dev);
......
drivers/staging/iio/accel/adis16201_ring.c
View file @ 14555b14
...@@ -61,7 +61,7 @@ static irqreturn_t adis16201_trigger_handler(int irq, void *p) ...@@ -61,7 +61,7 @@ static irqreturn_t adis16201_trigger_handler(int irq, void *p)
struct iio_poll_func *pf = p; struct iio_poll_func *pf = p;
struct iio_dev *indio_dev = pf->indio_dev; struct iio_dev *indio_dev = pf->indio_dev;
struct adis16201_state *st = iio_priv(indio_dev); struct adis16201_state *st = iio_priv(indio_dev);
struct iio_ring_buffer *ring = indio_dev->ring; struct iio_buffer *ring = indio_dev->buffer;
int i = 0; int i = 0;
s16 *data; s16 *data;
...@@ -94,11 +94,11 @@ static irqreturn_t adis16201_trigger_handler(int irq, void *p) ...@@ -94,11 +94,11 @@ static irqreturn_t adis16201_trigger_handler(int irq, void *p)
void adis16201_unconfigure_ring(struct iio_dev *indio_dev) void adis16201_unconfigure_ring(struct iio_dev *indio_dev)
{ {
iio_dealloc_pollfunc(indio_dev->pollfunc); iio_dealloc_pollfunc(indio_dev->pollfunc);
iio_sw_rb_free(indio_dev->ring); iio_sw_rb_free(indio_dev->buffer);
} }
static const struct iio_ring_setup_ops adis16201_ring_setup_ops = { static const struct iio_buffer_setup_ops adis16201_ring_setup_ops = {
.preenable = &iio_sw_ring_preenable, .preenable = &iio_sw_buffer_preenable,
.postenable = &iio_triggered_buffer_postenable, .postenable = &iio_triggered_buffer_postenable,
.predisable = &iio_triggered_buffer_predisable, .predisable = &iio_triggered_buffer_predisable,
}; };
...@@ -106,14 +106,14 @@ static const struct iio_ring_setup_ops adis16201_ring_setup_ops = { ...@@ -106,14 +106,14 @@ static const struct iio_ring_setup_ops adis16201_ring_setup_ops = {
int adis16201_configure_ring(struct iio_dev *indio_dev) int adis16201_configure_ring(struct iio_dev *indio_dev)
{ {
int ret = 0; int ret = 0;
struct iio_ring_buffer *ring; struct iio_buffer *ring;
ring = iio_sw_rb_allocate(indio_dev); ring = iio_sw_rb_allocate(indio_dev);
if (!ring) { if (!ring) {
ret = -ENOMEM; ret = -ENOMEM;
return ret; return ret;
} }
indio_dev->ring = ring; indio_dev->buffer = ring;
/* Effectively select the ring buffer implementation */ /* Effectively select the ring buffer implementation */
ring->bpe = 2; ring->bpe = 2;
ring->scan_timestamp = true; ring->scan_timestamp = true;
...@@ -135,6 +135,6 @@ int adis16201_configure_ring(struct iio_dev *indio_dev) ...@@ -135,6 +135,6 @@ int adis16201_configure_ring(struct iio_dev *indio_dev)
indio_dev->modes |= INDIO_BUFFER_TRIGGERED; indio_dev->modes |= INDIO_BUFFER_TRIGGERED;
return 0; return 0;
error_iio_sw_rb_free: error_iio_sw_rb_free:
iio_sw_rb_free(indio_dev->ring); iio_sw_rb_free(indio_dev->buffer);
return ret; return ret;
} }
drivers/staging/iio/accel/adis16203_core.c
View file @ 14555b14
...@@ -446,9 +446,9 @@ static int __devinit adis16203_probe(struct spi_device *spi) ...@@ -446,9 +446,9 @@ static int __devinit adis16203_probe(struct spi_device *spi)
if (ret) if (ret)
goto error_free_dev; goto error_free_dev;
ret = iio_ring_buffer_register(indio_dev, ret = iio_buffer_register(indio_dev,
adis16203_channels, adis16203_channels,
ARRAY_SIZE(adis16203_channels)); ARRAY_SIZE(adis16203_channels));
if (ret) { if (ret) {
printk(KERN_ERR "failed to initialize the ring\n"); printk(KERN_ERR "failed to initialize the ring\n");
goto error_unreg_ring_funcs; goto error_unreg_ring_funcs;
...@@ -474,7 +474,7 @@ static int __devinit adis16203_probe(struct spi_device *spi) ...@@ -474,7 +474,7 @@ static int __devinit adis16203_probe(struct spi_device *spi)
error_remove_trigger: error_remove_trigger:
adis16203_remove_trigger(indio_dev); adis16203_remove_trigger(indio_dev);
error_uninitialize_ring: error_uninitialize_ring:
iio_ring_buffer_unregister(indio_dev); iio_buffer_unregister(indio_dev);
error_unreg_ring_funcs: error_unreg_ring_funcs:
adis16203_unconfigure_ring(indio_dev); adis16203_unconfigure_ring(indio_dev);
error_free_dev: error_free_dev:
...@@ -488,7 +488,7 @@ static int adis16203_remove(struct spi_device *spi) ...@@ -488,7 +488,7 @@ static int adis16203_remove(struct spi_device *spi)
struct iio_dev *indio_dev = spi_get_drvdata(spi); struct iio_dev *indio_dev = spi_get_drvdata(spi);
adis16203_remove_trigger(indio_dev); adis16203_remove_trigger(indio_dev);
iio_ring_buffer_unregister(indio_dev); iio_buffer_unregister(indio_dev);
adis16203_unconfigure_ring(indio_dev); adis16203_unconfigure_ring(indio_dev);
iio_device_unregister(indio_dev); iio_device_unregister(indio_dev);
......
drivers/staging/iio/accel/adis16203_ring.c
View file @ 14555b14
...@@ -61,7 +61,7 @@ static irqreturn_t adis16203_trigger_handler(int irq, void *p) ...@@ -61,7 +61,7 @@ static irqreturn_t adis16203_trigger_handler(int irq, void *p)
struct iio_poll_func *pf = p; struct iio_poll_func *pf = p;
struct iio_dev *indio_dev = pf->indio_dev; struct iio_dev *indio_dev = pf->indio_dev;
struct adis16203_state *st = iio_priv(indio_dev); struct adis16203_state *st = iio_priv(indio_dev);
struct iio_ring_buffer *ring = indio_dev->ring; struct iio_buffer *ring = indio_dev->buffer;
int i = 0; int i = 0;
s16 *data; s16 *data;
...@@ -96,11 +96,11 @@ static irqreturn_t adis16203_trigger_handler(int irq, void *p) ...@@ -96,11 +96,11 @@ static irqreturn_t adis16203_trigger_handler(int irq, void *p)
void adis16203_unconfigure_ring(struct iio_dev *indio_dev) void adis16203_unconfigure_ring(struct iio_dev *indio_dev)
{ {
iio_dealloc_pollfunc(indio_dev->pollfunc); iio_dealloc_pollfunc(indio_dev->pollfunc);
iio_sw_rb_free(indio_dev->ring); iio_sw_rb_free(indio_dev->buffer);
} }
static const struct iio_ring_setup_ops adis16203_ring_setup_ops = { static const struct iio_buffer_setup_ops adis16203_ring_setup_ops = {
.preenable = &iio_sw_ring_preenable, .preenable = &iio_sw_buffer_preenable,
.postenable = &iio_triggered_buffer_postenable, .postenable = &iio_triggered_buffer_postenable,
.predisable = &iio_triggered_buffer_predisable, .predisable = &iio_triggered_buffer_predisable,
}; };
...@@ -108,14 +108,14 @@ static const struct iio_ring_setup_ops adis16203_ring_setup_ops = { ...@@ -108,14 +108,14 @@ static const struct iio_ring_setup_ops adis16203_ring_setup_ops = {
int adis16203_configure_ring(struct iio_dev *indio_dev) int adis16203_configure_ring(struct iio_dev *indio_dev)
{ {
int ret = 0; int ret = 0;
struct iio_ring_buffer *ring; struct iio_buffer *ring;
ring = iio_sw_rb_allocate(indio_dev); ring = iio_sw_rb_allocate(indio_dev);
if (!ring) { if (!ring) {
ret = -ENOMEM; ret = -ENOMEM;
return ret; return ret;
} }
indio_dev->ring = ring; indio_dev->buffer = ring;
/* Effectively select the ring buffer implementation */ /* Effectively select the ring buffer implementation */
ring->bpe = 2; ring->bpe = 2;
ring->scan_timestamp = true; ring->scan_timestamp = true;
...@@ -138,6 +138,6 @@ int adis16203_configure_ring(struct iio_dev *indio_dev) ...@@ -138,6 +138,6 @@ int adis16203_configure_ring(struct iio_dev *indio_dev)
return 0; return 0;
error_iio_sw_rb_free: error_iio_sw_rb_free:
iio_sw_rb_free(indio_dev->ring); iio_sw_rb_free(indio_dev->buffer);
return ret; return ret;
} }
drivers/staging/iio/accel/adis16204_core.c
View file @ 14555b14
...@@ -521,9 +521,9 @@ static int __devinit adis16204_probe(struct spi_device *spi) ...@@ -521,9 +521,9 @@ static int __devinit adis16204_probe(struct spi_device *spi)
if (ret) if (ret)
goto error_free_dev; goto error_free_dev;
ret = iio_ring_buffer_register(indio_dev, ret = iio_buffer_register(indio_dev,
adis16204_channels, adis16204_channels,
ARRAY_SIZE(adis16204_channels)); ARRAY_SIZE(adis16204_channels));
if (ret) { if (ret) {
printk(KERN_ERR "failed to initialize the ring\n"); printk(KERN_ERR "failed to initialize the ring\n");
goto error_unreg_ring_funcs; goto error_unreg_ring_funcs;
...@@ -548,7 +548,7 @@ static int __devinit adis16204_probe(struct spi_device *spi) ...@@ -548,7 +548,7 @@ static int __devinit adis16204_probe(struct spi_device *spi)
error_remove_trigger: error_remove_trigger:
adis16204_remove_trigger(indio_dev); adis16204_remove_trigger(indio_dev);
error_uninitialize_ring: error_uninitialize_ring:
iio_ring_buffer_unregister(indio_dev); iio_buffer_unregister(indio_dev);
error_unreg_ring_funcs: error_unreg_ring_funcs:
adis16204_unconfigure_ring(indio_dev); adis16204_unconfigure_ring(indio_dev);
error_free_dev: error_free_dev:
...@@ -562,7 +562,7 @@ static int adis16204_remove(struct spi_device *spi) ...@@ -562,7 +562,7 @@ static int adis16204_remove(struct spi_device *spi)
struct iio_dev *indio_dev = spi_get_drvdata(spi); struct iio_dev *indio_dev = spi_get_drvdata(spi);
adis16204_remove_trigger(indio_dev); adis16204_remove_trigger(indio_dev);
iio_ring_buffer_unregister(indio_dev); iio_buffer_unregister(indio_dev);
adis16204_unconfigure_ring(indio_dev); adis16204_unconfigure_ring(indio_dev);
iio_device_unregister(indio_dev); iio_device_unregister(indio_dev);
......
drivers/staging/iio/accel/adis16204_ring.c
View file @ 14555b14
...@@ -59,7 +59,7 @@ static irqreturn_t adis16204_trigger_handler(int irq, void *p) ...@@ -59,7 +59,7 @@ static irqreturn_t adis16204_trigger_handler(int irq, void *p)
struct iio_poll_func *pf = p; struct iio_poll_func *pf = p;
struct iio_dev *indio_dev = pf->indio_dev; struct iio_dev *indio_dev = pf->indio_dev;
struct adis16204_state *st = iio_priv(indio_dev); struct adis16204_state *st = iio_priv(indio_dev);
struct iio_ring_buffer *ring = indio_dev->ring; struct iio_buffer *ring = indio_dev->buffer;
int i = 0; int i = 0;
s16 *data; s16 *data;
size_t datasize = ring->access->get_bytes_per_datum(ring); size_t datasize = ring->access->get_bytes_per_datum(ring);
...@@ -91,11 +91,11 @@ static irqreturn_t adis16204_trigger_handler(int irq, void *p) ...@@ -91,11 +91,11 @@ static irqreturn_t adis16204_trigger_handler(int irq, void *p)
void adis16204_unconfigure_ring(struct iio_dev *indio_dev) void adis16204_unconfigure_ring(struct iio_dev *indio_dev)
{ {
iio_dealloc_pollfunc(indio_dev->pollfunc); iio_dealloc_pollfunc(indio_dev->pollfunc);
iio_sw_rb_free(indio_dev->ring); iio_sw_rb_free(indio_dev->buffer);
} }
static const struct iio_ring_setup_ops adis16204_ring_setup_ops = { static const struct iio_buffer_setup_ops adis16204_ring_setup_ops = {
.preenable = &iio_sw_ring_preenable, .preenable = &iio_sw_buffer_preenable,
.postenable = &iio_triggered_buffer_postenable, .postenable = &iio_triggered_buffer_postenable,
.predisable = &iio_triggered_buffer_predisable, .predisable = &iio_triggered_buffer_predisable,
}; };
...@@ -103,14 +103,14 @@ static const struct iio_ring_setup_ops adis16204_ring_setup_ops = { ...@@ -103,14 +103,14 @@ static const struct iio_ring_setup_ops adis16204_ring_setup_ops = {
int adis16204_configure_ring(struct iio_dev *indio_dev) int adis16204_configure_ring(struct iio_dev *indio_dev)
{ {
int ret = 0; int ret = 0;
struct iio_ring_buffer *ring; struct iio_buffer *ring;
ring = iio_sw_rb_allocate(indio_dev); ring = iio_sw_rb_allocate(indio_dev);
if (!ring) { if (!ring) {
ret = -ENOMEM; ret = -ENOMEM;
return ret; return ret;
} }
indio_dev->ring = ring; indio_dev->buffer = ring;
/* Effectively select the ring buffer implementation */ /* Effectively select the ring buffer implementation */
ring->access = &ring_sw_access_funcs; ring->access = &ring_sw_access_funcs;
ring->bpe = 2; ring->bpe = 2;
...@@ -134,6 +134,6 @@ int adis16204_configure_ring(struct iio_dev *indio_dev) ...@@ -134,6 +134,6 @@ int adis16204_configure_ring(struct iio_dev *indio_dev)
return 0; return 0;
error_iio_sw_rb_free: error_iio_sw_rb_free:
iio_sw_rb_free(indio_dev->ring); iio_sw_rb_free(indio_dev->buffer);
return ret; return ret;
} }
drivers/staging/iio/accel/adis16209_core.c
View file @ 14555b14
...@@ -494,9 +494,9 @@ static int __devinit adis16209_probe(struct spi_device *spi) ...@@ -494,9 +494,9 @@ static int __devinit adis16209_probe(struct spi_device *spi)
if (ret) if (ret)
goto error_free_dev; goto error_free_dev;
ret = iio_ring_buffer_register(indio_dev, ret = iio_buffer_register(indio_dev,
adis16209_channels, adis16209_channels,
ARRAY_SIZE(adis16209_channels)); ARRAY_SIZE(adis16209_channels));
if (ret) { if (ret) {
printk(KERN_ERR "failed to initialize the ring\n"); printk(KERN_ERR "failed to initialize the ring\n");
goto error_unreg_ring_funcs; goto error_unreg_ring_funcs;
...@@ -521,7 +521,7 @@ static int __devinit adis16209_probe(struct spi_device *spi) ...@@ -521,7 +521,7 @@ static int __devinit adis16209_probe(struct spi_device *spi)
error_remove_trigger: error_remove_trigger:
adis16209_remove_trigger(indio_dev); adis16209_remove_trigger(indio_dev);
error_uninitialize_ring: error_uninitialize_ring:
iio_ring_buffer_unregister(indio_dev); iio_buffer_unregister(indio_dev);
error_unreg_ring_funcs: error_unreg_ring_funcs:
adis16209_unconfigure_ring(indio_dev); adis16209_unconfigure_ring(indio_dev);
error_free_dev: error_free_dev:
...@@ -537,7 +537,7 @@ static int adis16209_remove(struct spi_device *spi) ...@@ -537,7 +537,7 @@ static int adis16209_remove(struct spi_device *spi)
flush_scheduled_work(); flush_scheduled_work();
adis16209_remove_trigger(indio_dev); adis16209_remove_trigger(indio_dev);
iio_ring_buffer_unregister(indio_dev); iio_buffer_unregister(indio_dev);
adis16209_unconfigure_ring(indio_dev); adis16209_unconfigure_ring(indio_dev);
iio_device_unregister(indio_dev); iio_device_unregister(indio_dev);
......
drivers/staging/iio/accel/adis16209_ring.c
View file @ 14555b14
...@@ -59,7 +59,7 @@ static irqreturn_t adis16209_trigger_handler(int irq, void *p) ...@@ -59,7 +59,7 @@ static irqreturn_t adis16209_trigger_handler(int irq, void *p)
struct iio_poll_func *pf = p; struct iio_poll_func *pf = p;
struct iio_dev *indio_dev = pf->indio_dev; struct iio_dev *indio_dev = pf->indio_dev;
struct adis16209_state *st = iio_priv(indio_dev); struct adis16209_state *st = iio_priv(indio_dev);
struct iio_ring_buffer *ring = indio_dev->ring; struct iio_buffer *ring = indio_dev->buffer;
int i = 0; int i = 0;
s16 *data; s16 *data;
...@@ -91,11 +91,11 @@ static irqreturn_t adis16209_trigger_handler(int irq, void *p) ...@@ -91,11 +91,11 @@ static irqreturn_t adis16209_trigger_handler(int irq, void *p)
void adis16209_unconfigure_ring(struct iio_dev *indio_dev) void adis16209_unconfigure_ring(struct iio_dev *indio_dev)
{ {
iio_dealloc_pollfunc(indio_dev->pollfunc); iio_dealloc_pollfunc(indio_dev->pollfunc);
iio_sw_rb_free(indio_dev->ring); iio_sw_rb_free(indio_dev->buffer);
} }
static const struct iio_ring_setup_ops adis16209_ring_setup_ops = { static const struct iio_buffer_setup_ops adis16209_ring_setup_ops = {
.preenable = &iio_sw_ring_preenable, .preenable = &iio_sw_buffer_preenable,
.postenable = &iio_triggered_buffer_postenable, .postenable = &iio_triggered_buffer_postenable,
.predisable = &iio_triggered_buffer_predisable, .predisable = &iio_triggered_buffer_predisable,
}; };
...@@ -103,14 +103,14 @@ static const struct iio_ring_setup_ops adis16209_ring_setup_ops = { ...@@ -103,14 +103,14 @@ static const struct iio_ring_setup_ops adis16209_ring_setup_ops = {
int adis16209_configure_ring(struct iio_dev *indio_dev) int adis16209_configure_ring(struct iio_dev *indio_dev)
{ {
int ret = 0; int ret = 0;
struct iio_ring_buffer *ring; struct iio_buffer *ring;
ring = iio_sw_rb_allocate(indio_dev); ring = iio_sw_rb_allocate(indio_dev);
if (!ring) { if (!ring) {
ret = -ENOMEM; ret = -ENOMEM;
return ret; return ret;
} }
indio_dev->ring = ring; indio_dev->buffer = ring;
/* Effectively select the ring buffer implementation */ /* Effectively select the ring buffer implementation */
ring->access = &ring_sw_access_funcs; ring->access = &ring_sw_access_funcs;
ring->bpe = 2; ring->bpe = 2;
...@@ -134,6 +134,6 @@ int adis16209_configure_ring(struct iio_dev *indio_dev) ...@@ -134,6 +134,6 @@ int adis16209_configure_ring(struct iio_dev *indio_dev)
return 0; return 0;
error_iio_sw_rb_free: error_iio_sw_rb_free:
iio_sw_rb_free(indio_dev->ring); iio_sw_rb_free(indio_dev->buffer);
return ret; return ret;
} }
drivers/staging/iio/accel/adis16240_core.c
View file @ 14555b14
...@@ -547,9 +547,9 @@ static int __devinit adis16240_probe(struct spi_device *spi) ...@@ -547,9 +547,9 @@ static int __devinit adis16240_probe(struct spi_device *spi)
if (ret) if (ret)
goto error_free_dev; goto error_free_dev;
ret = iio_ring_buffer_register(indio_dev, ret = iio_buffer_register(indio_dev,
adis16240_channels, adis16240_channels,
ARRAY_SIZE(adis16240_channels)); ARRAY_SIZE(adis16240_channels));
if (ret) { if (ret) {
printk(KERN_ERR "failed to initialize the ring\n"); printk(KERN_ERR "failed to initialize the ring\n");
goto error_unreg_ring_funcs; goto error_unreg_ring_funcs;
...@@ -573,7 +573,7 @@ static int __devinit adis16240_probe(struct spi_device *spi) ...@@ -573,7 +573,7 @@ static int __devinit adis16240_probe(struct spi_device *spi)
error_remove_trigger: error_remove_trigger:
adis16240_remove_trigger(indio_dev); adis16240_remove_trigger(indio_dev);
error_uninitialize_ring: error_uninitialize_ring:
iio_ring_buffer_unregister(indio_dev); iio_buffer_unregister(indio_dev);
error_unreg_ring_funcs: error_unreg_ring_funcs:
adis16240_unconfigure_ring(indio_dev); adis16240_unconfigure_ring(indio_dev);
error_free_dev: error_free_dev:
...@@ -590,7 +590,7 @@ static int adis16240_remove(struct spi_device *spi) ...@@ -590,7 +590,7 @@ static int adis16240_remove(struct spi_device *spi)
flush_scheduled_work(); flush_scheduled_work();
adis16240_remove_trigger(indio_dev); adis16240_remove_trigger(indio_dev);
iio_ring_buffer_unregister(indio_dev); iio_buffer_unregister(indio_dev);
adis16240_unconfigure_ring(indio_dev); adis16240_unconfigure_ring(indio_dev);
iio_device_unregister(indio_dev); iio_device_unregister(indio_dev);
......
drivers/staging/iio/accel/adis16240_ring.c
View file @ 14555b14
...@@ -56,7 +56,7 @@ static irqreturn_t adis16240_trigger_handler(int irq, void *p) ...@@ -56,7 +56,7 @@ static irqreturn_t adis16240_trigger_handler(int irq, void *p)
struct iio_poll_func *pf = p; struct iio_poll_func *pf = p;
struct iio_dev *indio_dev = pf->indio_dev; struct iio_dev *indio_dev = pf->indio_dev;
struct adis16240_state *st = iio_priv(indio_dev); struct adis16240_state *st = iio_priv(indio_dev);
struct iio_ring_buffer *ring = indio_dev->ring; struct iio_buffer *ring = indio_dev->buffer;
int i = 0; int i = 0;
s16 *data; s16 *data;
...@@ -88,11 +88,11 @@ static irqreturn_t adis16240_trigger_handler(int irq, void *p) ...@@ -88,11 +88,11 @@ static irqreturn_t adis16240_trigger_handler(int irq, void *p)
void adis16240_unconfigure_ring(struct iio_dev *indio_dev) void adis16240_unconfigure_ring(struct iio_dev *indio_dev)
{ {
iio_dealloc_pollfunc(indio_dev->pollfunc); iio_dealloc_pollfunc(indio_dev->pollfunc);
iio_sw_rb_free(indio_dev->ring); iio_sw_rb_free(indio_dev->buffer);
} }
static const struct iio_ring_setup_ops adis16240_ring_setup_ops = { static const struct iio_buffer_setup_ops adis16240_ring_setup_ops = {
.preenable = &iio_sw_ring_preenable, .preenable = &iio_sw_buffer_preenable,
.postenable = &iio_triggered_buffer_postenable, .postenable = &iio_triggered_buffer_postenable,
.predisable = &iio_triggered_buffer_predisable, .predisable = &iio_triggered_buffer_predisable,
}; };
...@@ -100,14 +100,14 @@ static const struct iio_ring_setup_ops adis16240_ring_setup_ops = { ...@@ -100,14 +100,14 @@ static const struct iio_ring_setup_ops adis16240_ring_setup_ops = {
int adis16240_configure_ring(struct iio_dev *indio_dev) int adis16240_configure_ring(struct iio_dev *indio_dev)
{ {
int ret = 0; int ret = 0;
struct iio_ring_buffer *ring; struct iio_buffer *ring;
ring = iio_sw_rb_allocate(indio_dev); ring = iio_sw_rb_allocate(indio_dev);
if (!ring) { if (!ring) {
ret = -ENOMEM; ret = -ENOMEM;
return ret; return ret;
} }
indio_dev->ring = ring; indio_dev->buffer = ring;
/* Effectively select the ring buffer implementation */ /* Effectively select the ring buffer implementation */
ring->access = &ring_sw_access_funcs; ring->access = &ring_sw_access_funcs;
ring->bpe = 2; ring->bpe = 2;
...@@ -131,6 +131,6 @@ int adis16240_configure_ring(struct iio_dev *indio_dev) ...@@ -131,6 +131,6 @@ int adis16240_configure_ring(struct iio_dev *indio_dev)
return 0; return 0;
error_iio_sw_rb_free: error_iio_sw_rb_free:
iio_sw_rb_free(indio_dev->ring); iio_sw_rb_free(indio_dev->buffer);
return ret; return ret;
} }
drivers/staging/iio/accel/lis3l02dq.h
View file @ 14555b14
...@@ -181,7 +181,7 @@ int lis3l02dq_disable_all_events(struct iio_dev *indio_dev); ...@@ -181,7 +181,7 @@ int lis3l02dq_disable_all_events(struct iio_dev *indio_dev);
void lis3l02dq_remove_trigger(struct iio_dev *indio_dev); void lis3l02dq_remove_trigger(struct iio_dev *indio_dev);
int lis3l02dq_probe_trigger(struct iio_dev *indio_dev); int lis3l02dq_probe_trigger(struct iio_dev *indio_dev);
ssize_t lis3l02dq_read_accel_from_ring(struct iio_ring_buffer *ring, ssize_t lis3l02dq_read_accel_from_ring(struct iio_buffer *ring,
int index, int index,
int *val); int *val);
...@@ -213,7 +213,7 @@ static inline int lis3l02dq_probe_trigger(struct iio_dev *indio_dev) ...@@ -213,7 +213,7 @@ static inline int lis3l02dq_probe_trigger(struct iio_dev *indio_dev)
return 0; return 0;
} }
static inline ssize_t static inline ssize_t
lis3l02dq_read_accel_from_ring(struct iio_ring_buffer *ring, lis3l02dq_read_accel_from_ring(struct iio_buffer *ring,
int index, int index,
int *val) int *val)
{ {
......
drivers/staging/iio/accel/lis3l02dq_core.c
View file @ 14555b14
...@@ -260,7 +260,7 @@ static int lis3l02dq_read_raw(struct iio_dev *indio_dev, ...@@ -260,7 +260,7 @@ static int lis3l02dq_read_raw(struct iio_dev *indio_dev,
/* Take the iio_dev status lock */ /* Take the iio_dev status lock */
mutex_lock(&indio_dev->mlock); mutex_lock(&indio_dev->mlock);
if (indio_dev->currentmode == INDIO_BUFFER_TRIGGERED) if (indio_dev->currentmode == INDIO_BUFFER_TRIGGERED)
ret = lis3l02dq_read_accel_from_ring(indio_dev->ring, ret = lis3l02dq_read_accel_from_ring(indio_dev->buffer,
chan->scan_index, chan->scan_index,
val); val);
else { else {
...@@ -690,9 +690,9 @@ static int __devinit lis3l02dq_probe(struct spi_device *spi) ...@@ -690,9 +690,9 @@ static int __devinit lis3l02dq_probe(struct spi_device *spi)
if (ret) if (ret)
goto error_free_dev; goto error_free_dev;
ret = iio_ring_buffer_register(indio_dev, ret = iio_buffer_register(indio_dev,
lis3l02dq_channels, lis3l02dq_channels,
ARRAY_SIZE(lis3l02dq_channels)); ARRAY_SIZE(lis3l02dq_channels));
if (ret) { if (ret) {
printk(KERN_ERR "failed to initialize the ring\n"); printk(KERN_ERR "failed to initialize the ring\n");
goto error_unreg_ring_funcs; goto error_unreg_ring_funcs;
...@@ -731,7 +731,7 @@ static int __devinit lis3l02dq_probe(struct spi_device *spi) ...@@ -731,7 +731,7 @@ static int __devinit lis3l02dq_probe(struct spi_device *spi)
if (spi->irq && gpio_is_valid(irq_to_gpio(spi->irq)) > 0) if (spi->irq && gpio_is_valid(irq_to_gpio(spi->irq)) > 0)
free_irq(st->us->irq, indio_dev); free_irq(st->us->irq, indio_dev);
error_uninitialize_ring: error_uninitialize_ring:
iio_ring_buffer_unregister(indio_dev); iio_buffer_unregister(indio_dev);
error_unreg_ring_funcs: error_unreg_ring_funcs:
lis3l02dq_unconfigure_ring(indio_dev); lis3l02dq_unconfigure_ring(indio_dev);
error_free_dev: error_free_dev:
...@@ -785,7 +785,7 @@ static int lis3l02dq_remove(struct spi_device *spi) ...@@ -785,7 +785,7 @@ static int lis3l02dq_remove(struct spi_device *spi)
free_irq(st->us->irq, indio_dev); free_irq(st->us->irq, indio_dev);
lis3l02dq_remove_trigger(indio_dev); lis3l02dq_remove_trigger(indio_dev);
iio_ring_buffer_unregister(indio_dev); iio_buffer_unregister(indio_dev);
lis3l02dq_unconfigure_ring(indio_dev); lis3l02dq_unconfigure_ring(indio_dev);
iio_device_unregister(indio_dev); iio_device_unregister(indio_dev);
......
drivers/staging/iio/accel/lis3l02dq_ring.c
View file @ 14555b14
...@@ -40,7 +40,7 @@ irqreturn_t lis3l02dq_data_rdy_trig_poll(int irq, void *private) ...@@ -40,7 +40,7 @@ irqreturn_t lis3l02dq_data_rdy_trig_poll(int irq, void *private)
/** /**
* lis3l02dq_read_accel_from_ring() individual acceleration read from ring * lis3l02dq_read_accel_from_ring() individual acceleration read from ring
**/ **/
ssize_t lis3l02dq_read_accel_from_ring(struct iio_ring_buffer *ring, ssize_t lis3l02dq_read_accel_from_ring(struct iio_buffer *ring,
int index, int index,
int *val) int *val)
{ {
...@@ -86,7 +86,7 @@ static const u8 read_all_tx_array[] = { ...@@ -86,7 +86,7 @@ static const u8 read_all_tx_array[] = {
**/ **/
static int lis3l02dq_read_all(struct iio_dev *indio_dev, u8 *rx_array) static int lis3l02dq_read_all(struct iio_dev *indio_dev, u8 *rx_array)
{ {
struct iio_ring_buffer *ring = indio_dev->ring; struct iio_buffer *ring = indio_dev->buffer;
struct lis3l02dq_state *st = iio_priv(indio_dev); struct lis3l02dq_state *st = iio_priv(indio_dev);
struct spi_transfer *xfers; struct spi_transfer *xfers;
struct spi_message msg; struct spi_message msg;
...@@ -145,13 +145,13 @@ static int lis3l02dq_get_ring_element(struct iio_dev *indio_dev, ...@@ -145,13 +145,13 @@ static int lis3l02dq_get_ring_element(struct iio_dev *indio_dev,
u8 *rx_array ; u8 *rx_array ;
s16 *data = (s16 *)buf; s16 *data = (s16 *)buf;
rx_array = kzalloc(4 * (indio_dev->ring->scan_count), GFP_KERNEL); rx_array = kzalloc(4 * (indio_dev->buffer->scan_count), GFP_KERNEL);
if (rx_array == NULL) if (rx_array == NULL)
return -ENOMEM; return -ENOMEM;
ret = lis3l02dq_read_all(indio_dev, rx_array); ret = lis3l02dq_read_all(indio_dev, rx_array);
if (ret < 0) if (ret < 0)
return ret; return ret;
for (i = 0; i < indio_dev->ring->scan_count; i++) for (i = 0; i < indio_dev->buffer->scan_count; i++)
data[i] = combine_8_to_16(rx_array[i*4+1], data[i] = combine_8_to_16(rx_array[i*4+1],
rx_array[i*4+3]); rx_array[i*4+3]);
kfree(rx_array); kfree(rx_array);
...@@ -163,7 +163,7 @@ static irqreturn_t lis3l02dq_trigger_handler(int irq, void *p) ...@@ -163,7 +163,7 @@ static irqreturn_t lis3l02dq_trigger_handler(int irq, void *p)
{ {
struct iio_poll_func *pf = p; struct iio_poll_func *pf = p;
struct iio_dev *indio_dev = pf->indio_dev; struct iio_dev *indio_dev = pf->indio_dev;
struct iio_ring_buffer *ring = indio_dev->ring; struct iio_buffer *ring = indio_dev->buffer;
int len = 0; int len = 0;
size_t datasize = ring->access->get_bytes_per_datum(ring); size_t datasize = ring->access->get_bytes_per_datum(ring);
char *data = kmalloc(datasize, GFP_KERNEL); char *data = kmalloc(datasize, GFP_KERNEL);
...@@ -346,7 +346,7 @@ void lis3l02dq_remove_trigger(struct iio_dev *indio_dev) ...@@ -346,7 +346,7 @@ void lis3l02dq_remove_trigger(struct iio_dev *indio_dev)
void lis3l02dq_unconfigure_ring(struct iio_dev *indio_dev) void lis3l02dq_unconfigure_ring(struct iio_dev *indio_dev)
{ {
iio_dealloc_pollfunc(indio_dev->pollfunc); iio_dealloc_pollfunc(indio_dev->pollfunc);
lis3l02dq_free_buf(indio_dev->ring); lis3l02dq_free_buf(indio_dev->buffer);
} }
static int lis3l02dq_ring_postenable(struct iio_dev *indio_dev) static int lis3l02dq_ring_postenable(struct iio_dev *indio_dev)
...@@ -362,17 +362,17 @@ static int lis3l02dq_ring_postenable(struct iio_dev *indio_dev) ...@@ -362,17 +362,17 @@ static int lis3l02dq_ring_postenable(struct iio_dev *indio_dev)
if (ret) if (ret)
goto error_ret; goto error_ret;
if (iio_scan_mask_query(indio_dev->ring, 0)) { if (iio_scan_mask_query(indio_dev->buffer, 0)) {
t |= LIS3L02DQ_REG_CTRL_1_AXES_X_ENABLE; t |= LIS3L02DQ_REG_CTRL_1_AXES_X_ENABLE;
oneenabled = true; oneenabled = true;
} else } else
t &= ~LIS3L02DQ_REG_CTRL_1_AXES_X_ENABLE; t &= ~LIS3L02DQ_REG_CTRL_1_AXES_X_ENABLE;
if (iio_scan_mask_query(indio_dev->ring, 1)) { if (iio_scan_mask_query(indio_dev->buffer, 1)) {
t |= LIS3L02DQ_REG_CTRL_1_AXES_Y_ENABLE; t |= LIS3L02DQ_REG_CTRL_1_AXES_Y_ENABLE;
oneenabled = true; oneenabled = true;
} else } else
t &= ~LIS3L02DQ_REG_CTRL_1_AXES_Y_ENABLE; t &= ~LIS3L02DQ_REG_CTRL_1_AXES_Y_ENABLE;
if (iio_scan_mask_query(indio_dev->ring, 2)) { if (iio_scan_mask_query(indio_dev->buffer, 2)) {
t |= LIS3L02DQ_REG_CTRL_1_AXES_Z_ENABLE; t |= LIS3L02DQ_REG_CTRL_1_AXES_Z_ENABLE;
oneenabled = true; oneenabled = true;
} else } else
...@@ -418,8 +418,8 @@ static int lis3l02dq_ring_predisable(struct iio_dev *indio_dev) ...@@ -418,8 +418,8 @@ static int lis3l02dq_ring_predisable(struct iio_dev *indio_dev)
return ret; return ret;
} }
static const struct iio_ring_setup_ops lis3l02dq_ring_setup_ops = { static const struct iio_buffer_setup_ops lis3l02dq_ring_setup_ops = {
.preenable = &iio_sw_ring_preenable, .preenable = &iio_sw_buffer_preenable,
.postenable = &lis3l02dq_ring_postenable, .postenable = &lis3l02dq_ring_postenable,
.predisable = &lis3l02dq_ring_predisable, .predisable = &lis3l02dq_ring_predisable,
}; };
...@@ -427,15 +427,15 @@ static const struct iio_ring_setup_ops lis3l02dq_ring_setup_ops = { ...@@ -427,15 +427,15 @@ static const struct iio_ring_setup_ops lis3l02dq_ring_setup_ops = {
int lis3l02dq_configure_ring(struct iio_dev *indio_dev) int lis3l02dq_configure_ring(struct iio_dev *indio_dev)
{ {
int ret; int ret;
struct iio_ring_buffer *ring; struct iio_buffer *ring;
ring = lis3l02dq_alloc_buf(indio_dev); ring = lis3l02dq_alloc_buf(indio_dev);
if (!ring) if (!ring)
return -ENOMEM; return -ENOMEM;
indio_dev->ring = ring; indio_dev->buffer = ring;
/* Effectively select the ring buffer implementation */ /* Effectively select the ring buffer implementation */
indio_dev->ring->access = &lis3l02dq_access_funcs; indio_dev->buffer->access = &lis3l02dq_access_funcs;
ring->bpe = 2; ring->bpe = 2;
ring->scan_timestamp = true; ring->scan_timestamp = true;
...@@ -459,6 +459,6 @@ int lis3l02dq_configure_ring(struct iio_dev *indio_dev) ...@@ -459,6 +459,6 @@ int lis3l02dq_configure_ring(struct iio_dev *indio_dev)
return 0; return 0;
error_iio_sw_rb_free: error_iio_sw_rb_free:
lis3l02dq_free_buf(indio_dev->ring); lis3l02dq_free_buf(indio_dev->buffer);
return ret; return ret;
} }
drivers/staging/iio/accel/sca3000.h
View file @ 14555b14
...@@ -248,7 +248,7 @@ void sca3000_unconfigure_ring(struct iio_dev *indio_dev); ...@@ -248,7 +248,7 @@ void sca3000_unconfigure_ring(struct iio_dev *indio_dev);
* sca3000_ring_int_process() handles ring related event pushing and escalation * sca3000_ring_int_process() handles ring related event pushing and escalation
* @val: the event code * @val: the event code
**/ **/
void sca3000_ring_int_process(u8 val, struct iio_ring_buffer *ring); void sca3000_ring_int_process(u8 val, struct iio_buffer *ring);
#else #else
static inline void sca3000_register_ring_funcs(struct iio_dev *indio_dev) static inline void sca3000_register_ring_funcs(struct iio_dev *indio_dev)
......
drivers/staging/iio/accel/sca3000_core.c
View file @ 14555b14
...@@ -812,7 +812,7 @@ static irqreturn_t sca3000_event_handler(int irq, void *private) ...@@ -812,7 +812,7 @@ static irqreturn_t sca3000_event_handler(int irq, void *private)
if (ret) if (ret)
goto done; goto done;
sca3000_ring_int_process(val, indio_dev->ring); sca3000_ring_int_process(val, indio_dev->buffer);
if (val & SCA3000_INT_STATUS_FREE_FALL) if (val & SCA3000_INT_STATUS_FREE_FALL)
iio_push_event(indio_dev, iio_push_event(indio_dev,
...@@ -1156,15 +1156,15 @@ static int __devinit sca3000_probe(struct spi_device *spi) ...@@ -1156,15 +1156,15 @@ static int __devinit sca3000_probe(struct spi_device *spi)
if (ret < 0) if (ret < 0)
goto error_free_dev; goto error_free_dev;
regdone = 1; regdone = 1;
ret = iio_ring_buffer_register(indio_dev, ret = iio_buffer_register(indio_dev,
sca3000_channels, sca3000_channels,
ARRAY_SIZE(sca3000_channels)); ARRAY_SIZE(sca3000_channels));
if (ret < 0) if (ret < 0)
goto error_unregister_dev; goto error_unregister_dev;
if (indio_dev->ring) { if (indio_dev->buffer) {
iio_scan_mask_set(indio_dev->ring, 0); iio_scan_mask_set(indio_dev->buffer, 0);
iio_scan_mask_set(indio_dev->ring, 1); iio_scan_mask_set(indio_dev->buffer, 1);
iio_scan_mask_set(indio_dev->ring, 2); iio_scan_mask_set(indio_dev->buffer, 2);
} }
if (spi->irq && gpio_is_valid(irq_to_gpio(spi->irq)) > 0) { if (spi->irq && gpio_is_valid(irq_to_gpio(spi->irq)) > 0) {
...@@ -1187,7 +1187,7 @@ static int __devinit sca3000_probe(struct spi_device *spi) ...@@ -1187,7 +1187,7 @@ static int __devinit sca3000_probe(struct spi_device *spi)
if (spi->irq && gpio_is_valid(irq_to_gpio(spi->irq)) > 0) if (spi->irq && gpio_is_valid(irq_to_gpio(spi->irq)) > 0)
free_irq(spi->irq, indio_dev); free_irq(spi->irq, indio_dev);
error_unregister_ring: error_unregister_ring:
iio_ring_buffer_unregister(indio_dev); iio_buffer_unregister(indio_dev);
error_unregister_dev: error_unregister_dev:
error_free_dev: error_free_dev:
if (regdone) if (regdone)
...@@ -1228,7 +1228,7 @@ static int sca3000_remove(struct spi_device *spi) ...@@ -1228,7 +1228,7 @@ static int sca3000_remove(struct spi_device *spi)
return ret; return ret;
if (spi->irq && gpio_is_valid(irq_to_gpio(spi->irq)) > 0) if (spi->irq && gpio_is_valid(irq_to_gpio(spi->irq)) > 0)
free_irq(spi->irq, indio_dev); free_irq(spi->irq, indio_dev);
iio_ring_buffer_unregister(indio_dev); iio_buffer_unregister(indio_dev);
sca3000_unconfigure_ring(indio_dev); sca3000_unconfigure_ring(indio_dev);
iio_device_unregister(indio_dev); iio_device_unregister(indio_dev);
......
drivers/staging/iio/accel/sca3000_ring.c
View file @ 14555b14
...@@ -81,10 +81,10 @@ static int sca3000_read_data(struct sca3000_state *st, ...@@ -81,10 +81,10 @@ static int sca3000_read_data(struct sca3000_state *st,
* can only be inferred approximately from ring buffer events such as 50% full * can only be inferred approximately from ring buffer events such as 50% full
* and knowledge of when buffer was last emptied. This is left to userspace. * and knowledge of when buffer was last emptied. This is left to userspace.
**/ **/
static int sca3000_read_first_n_hw_rb(struct iio_ring_buffer *r, static int sca3000_read_first_n_hw_rb(struct iio_buffer *r,
size_t count, char __user *buf) size_t count, char __user *buf)
{ {
struct iio_hw_ring_buffer *hw_ring = iio_to_hw_ring_buf(r); struct iio_hw_buffer *hw_ring = iio_to_hw_buf(r);
struct iio_dev *indio_dev = hw_ring->private; struct iio_dev *indio_dev = hw_ring->private;
struct sca3000_state *st = iio_priv(indio_dev); struct sca3000_state *st = iio_priv(indio_dev);
u8 *rx; u8 *rx;
...@@ -134,20 +134,20 @@ static int sca3000_read_first_n_hw_rb(struct iio_ring_buffer *r, ...@@ -134,20 +134,20 @@ static int sca3000_read_first_n_hw_rb(struct iio_ring_buffer *r,
} }
/* This is only valid with all 3 elements enabled */ /* This is only valid with all 3 elements enabled */
static int sca3000_ring_get_length(struct iio_ring_buffer *r) static int sca3000_ring_get_length(struct iio_buffer *r)
{ {
return 64; return 64;
} }
/* only valid if resolution is kept at 11bits */ /* only valid if resolution is kept at 11bits */
static int sca3000_ring_get_bytes_per_datum(struct iio_ring_buffer *r) static int sca3000_ring_get_bytes_per_datum(struct iio_buffer *r)
{ {
return 6; return 6;
} }
static IIO_RING_ENABLE_ATTR; static IIO_BUFFER_ENABLE_ATTR;
static IIO_RING_BYTES_PER_DATUM_ATTR; static IIO_BUFFER_BYTES_PER_DATUM_ATTR;
static IIO_RING_LENGTH_ATTR; static IIO_BUFFER_LENGTH_ATTR;
/** /**
* sca3000_query_ring_int() is the hardware ring status interrupt enabled * sca3000_query_ring_int() is the hardware ring status interrupt enabled
...@@ -158,7 +158,7 @@ static ssize_t sca3000_query_ring_int(struct device *dev, ...@@ -158,7 +158,7 @@ static ssize_t sca3000_query_ring_int(struct device *dev,
{ {
struct iio_dev_attr *this_attr = to_iio_dev_attr(attr); struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
int ret, val; int ret, val;
struct iio_ring_buffer *ring = dev_get_drvdata(dev); struct iio_buffer *ring = dev_get_drvdata(dev);
struct iio_dev *indio_dev = ring->indio_dev; struct iio_dev *indio_dev = ring->indio_dev;
struct sca3000_state *st = iio_priv(indio_dev); struct sca3000_state *st = iio_priv(indio_dev);
...@@ -180,7 +180,7 @@ static ssize_t sca3000_set_ring_int(struct device *dev, ...@@ -180,7 +180,7 @@ static ssize_t sca3000_set_ring_int(struct device *dev,
const char *buf, const char *buf,
size_t len) size_t len)
{ {
struct iio_ring_buffer *ring = dev_get_drvdata(dev); struct iio_buffer *ring = dev_get_drvdata(dev);
struct iio_dev *indio_dev = ring->indio_dev; struct iio_dev *indio_dev = ring->indio_dev;
struct sca3000_state *st = iio_priv(indio_dev); struct sca3000_state *st = iio_priv(indio_dev);
struct iio_dev_attr *this_attr = to_iio_dev_attr(attr); struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
...@@ -222,7 +222,7 @@ static ssize_t sca3000_show_buffer_scale(struct device *dev, ...@@ -222,7 +222,7 @@ static ssize_t sca3000_show_buffer_scale(struct device *dev,
struct device_attribute *attr, struct device_attribute *attr,
char *buf) char *buf)
{ {
struct iio_ring_buffer *ring = dev_get_drvdata(dev); struct iio_buffer *ring = dev_get_drvdata(dev);
struct iio_dev *indio_dev = ring->indio_dev; struct iio_dev *indio_dev = ring->indio_dev;
struct sca3000_state *st = iio_priv(indio_dev); struct sca3000_state *st = iio_priv(indio_dev);
...@@ -256,10 +256,10 @@ static struct attribute_group sca3000_ring_attr = { ...@@ -256,10 +256,10 @@ static struct attribute_group sca3000_ring_attr = {
.name = "buffer", .name = "buffer",
}; };
static struct iio_ring_buffer *sca3000_rb_allocate(struct iio_dev *indio_dev) static struct iio_buffer *sca3000_rb_allocate(struct iio_dev *indio_dev)
{ {
struct iio_ring_buffer *buf; struct iio_buffer *buf;
struct iio_hw_ring_buffer *ring; struct iio_hw_buffer *ring;
ring = kzalloc(sizeof *ring, GFP_KERNEL); ring = kzalloc(sizeof *ring, GFP_KERNEL);
if (!ring) if (!ring)
...@@ -269,17 +269,17 @@ static struct iio_ring_buffer *sca3000_rb_allocate(struct iio_dev *indio_dev) ...@@ -269,17 +269,17 @@ static struct iio_ring_buffer *sca3000_rb_allocate(struct iio_dev *indio_dev)
buf = &ring->buf; buf = &ring->buf;
buf->stufftoread = 0; buf->stufftoread = 0;
buf->attrs = &sca3000_ring_attr; buf->attrs = &sca3000_ring_attr;
iio_ring_buffer_init(buf, indio_dev); iio_buffer_init(buf, indio_dev);
return buf; return buf;
} }
static inline void sca3000_rb_free(struct iio_ring_buffer *r) static inline void sca3000_rb_free(struct iio_buffer *r)
{ {
kfree(iio_to_hw_ring_buf(r)); kfree(iio_to_hw_buf(r));
} }
static const struct iio_ring_access_funcs sca3000_ring_access_funcs = { static const struct iio_buffer_access_funcs sca3000_ring_access_funcs = {
.read_first_n = &sca3000_read_first_n_hw_rb, .read_first_n = &sca3000_read_first_n_hw_rb,
.get_length = &sca3000_ring_get_length, .get_length = &sca3000_ring_get_length,
.get_bytes_per_datum = &sca3000_ring_get_bytes_per_datum, .get_bytes_per_datum = &sca3000_ring_get_bytes_per_datum,
...@@ -287,19 +287,19 @@ static const struct iio_ring_access_funcs sca3000_ring_access_funcs = { ...@@ -287,19 +287,19 @@ static const struct iio_ring_access_funcs sca3000_ring_access_funcs = {
int sca3000_configure_ring(struct iio_dev *indio_dev) int sca3000_configure_ring(struct iio_dev *indio_dev)
{ {
indio_dev->ring = sca3000_rb_allocate(indio_dev); indio_dev->buffer = sca3000_rb_allocate(indio_dev);
if (indio_dev->ring == NULL) if (indio_dev->buffer == NULL)
return -ENOMEM; return -ENOMEM;
indio_dev->modes |= INDIO_BUFFER_HARDWARE; indio_dev->modes |= INDIO_BUFFER_HARDWARE;
indio_dev->ring->access = &sca3000_ring_access_funcs; indio_dev->buffer->access = &sca3000_ring_access_funcs;
return 0; return 0;
} }
void sca3000_unconfigure_ring(struct iio_dev *indio_dev) void sca3000_unconfigure_ring(struct iio_dev *indio_dev)
{ {
sca3000_rb_free(indio_dev->ring); sca3000_rb_free(indio_dev->buffer);
} }
static inline static inline
...@@ -343,14 +343,14 @@ static int sca3000_hw_ring_postdisable(struct iio_dev *indio_dev) ...@@ -343,14 +343,14 @@ static int sca3000_hw_ring_postdisable(struct iio_dev *indio_dev)
return __sca3000_hw_ring_state_set(indio_dev, 0); return __sca3000_hw_ring_state_set(indio_dev, 0);
} }
static const struct iio_ring_setup_ops sca3000_ring_setup_ops = { static const struct iio_buffer_setup_ops sca3000_ring_setup_ops = {
.preenable = &sca3000_hw_ring_preenable, .preenable = &sca3000_hw_ring_preenable,
.postdisable = &sca3000_hw_ring_postdisable, .postdisable = &sca3000_hw_ring_postdisable,
}; };
void sca3000_register_ring_funcs(struct iio_dev *indio_dev) void sca3000_register_ring_funcs(struct iio_dev *indio_dev)
{ {
indio_dev->ring->setup_ops = &sca3000_ring_setup_ops; indio_dev->buffer->setup_ops = &sca3000_ring_setup_ops;
} }
/** /**
...@@ -359,7 +359,7 @@ void sca3000_register_ring_funcs(struct iio_dev *indio_dev) ...@@ -359,7 +359,7 @@ void sca3000_register_ring_funcs(struct iio_dev *indio_dev)
* This is only split from the main interrupt handler so as to * This is only split from the main interrupt handler so as to
* reduce the amount of code if the ring buffer is not enabled. * reduce the amount of code if the ring buffer is not enabled.
**/ **/
void sca3000_ring_int_process(u8 val, struct iio_ring_buffer *ring) void sca3000_ring_int_process(u8 val, struct iio_buffer *ring)
{ {
if (val & (SCA3000_INT_STATUS_THREE_QUARTERS | if (val & (SCA3000_INT_STATUS_THREE_QUARTERS |
SCA3000_INT_STATUS_HALF)) { SCA3000_INT_STATUS_HALF)) {
......
drivers/staging/iio/adc/ad7192.c
View file @ 14555b14
...@@ -455,7 +455,7 @@ static int ad7192_setup(struct ad7192_state *st) ...@@ -455,7 +455,7 @@ static int ad7192_setup(struct ad7192_state *st)
static int ad7192_scan_from_ring(struct ad7192_state *st, unsigned ch, int *val) static int ad7192_scan_from_ring(struct ad7192_state *st, unsigned ch, int *val)
{ {
struct iio_ring_buffer *ring = iio_priv_to_dev(st)->ring; struct iio_buffer *ring = iio_priv_to_dev(st)->buffer;
int ret; int ret;
s64 dat64[2]; s64 dat64[2];
u32 *dat32 = (u32 *)dat64; u32 *dat32 = (u32 *)dat64;
...@@ -475,7 +475,7 @@ static int ad7192_scan_from_ring(struct ad7192_state *st, unsigned ch, int *val) ...@@ -475,7 +475,7 @@ static int ad7192_scan_from_ring(struct ad7192_state *st, unsigned ch, int *val)
static int ad7192_ring_preenable(struct iio_dev *indio_dev) static int ad7192_ring_preenable(struct iio_dev *indio_dev)
{ {
struct ad7192_state *st = iio_priv(indio_dev); struct ad7192_state *st = iio_priv(indio_dev);
struct iio_ring_buffer *ring = indio_dev->ring; struct iio_buffer *ring = indio_dev->buffer;
size_t d_size; size_t d_size;
unsigned channel; unsigned channel;
...@@ -494,9 +494,9 @@ static int ad7192_ring_preenable(struct iio_dev *indio_dev) ...@@ -494,9 +494,9 @@ static int ad7192_ring_preenable(struct iio_dev *indio_dev)
d_size += sizeof(s64) - (d_size % sizeof(s64)); d_size += sizeof(s64) - (d_size % sizeof(s64));
} }
if (indio_dev->ring->access->set_bytes_per_datum) if (indio_dev->buffer->access->set_bytes_per_datum)
indio_dev->ring->access->set_bytes_per_datum(indio_dev->ring, indio_dev->buffer->access->
d_size); set_bytes_per_datum(indio_dev->buffer, d_size);
st->mode = (st->mode & ~AD7192_MODE_SEL(-1)) | st->mode = (st->mode & ~AD7192_MODE_SEL(-1)) |
AD7192_MODE_SEL(AD7192_MODE_CONT); AD7192_MODE_SEL(AD7192_MODE_CONT);
...@@ -539,7 +539,7 @@ static irqreturn_t ad7192_trigger_handler(int irq, void *p) ...@@ -539,7 +539,7 @@ static irqreturn_t ad7192_trigger_handler(int irq, void *p)
{ {
struct iio_poll_func *pf = p; struct iio_poll_func *pf = p;
struct iio_dev *indio_dev = pf->indio_dev; struct iio_dev *indio_dev = pf->indio_dev;
struct iio_ring_buffer *ring = indio_dev->ring; struct iio_buffer *ring = indio_dev->buffer;
struct ad7192_state *st = iio_priv(indio_dev); struct ad7192_state *st = iio_priv(indio_dev);
s64 dat64[2]; s64 dat64[2];
s32 *dat32 = (s32 *)dat64; s32 *dat32 = (s32 *)dat64;
...@@ -562,7 +562,7 @@ static irqreturn_t ad7192_trigger_handler(int irq, void *p) ...@@ -562,7 +562,7 @@ static irqreturn_t ad7192_trigger_handler(int irq, void *p)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static const struct iio_ring_setup_ops ad7192_ring_setup_ops = { static const struct iio_buffer_setup_ops ad7192_ring_setup_ops = {
.preenable = &ad7192_ring_preenable, .preenable = &ad7192_ring_preenable,
.postenable = &iio_triggered_buffer_postenable, .postenable = &iio_triggered_buffer_postenable,
.predisable = &iio_triggered_buffer_predisable, .predisable = &iio_triggered_buffer_predisable,
...@@ -573,13 +573,13 @@ static int ad7192_register_ring_funcs_and_init(struct iio_dev *indio_dev) ...@@ -573,13 +573,13 @@ static int ad7192_register_ring_funcs_and_init(struct iio_dev *indio_dev)
{ {
int ret; int ret;
indio_dev->ring = iio_sw_rb_allocate(indio_dev); indio_dev->buffer = iio_sw_rb_allocate(indio_dev);
if (!indio_dev->ring) { if (!indio_dev->buffer) {
ret = -ENOMEM; ret = -ENOMEM;
goto error_ret; goto error_ret;
} }
/* Effectively select the ring buffer implementation */ /* Effectively select the ring buffer implementation */
indio_dev->ring->access = &ring_sw_access_funcs; indio_dev->buffer->access = &ring_sw_access_funcs;
indio_dev->pollfunc = iio_alloc_pollfunc(&iio_pollfunc_store_time, indio_dev->pollfunc = iio_alloc_pollfunc(&iio_pollfunc_store_time,
&ad7192_trigger_handler, &ad7192_trigger_handler,
IRQF_ONESHOT, IRQF_ONESHOT,
...@@ -592,14 +592,14 @@ static int ad7192_register_ring_funcs_and_init(struct iio_dev *indio_dev) ...@@ -592,14 +592,14 @@ static int ad7192_register_ring_funcs_and_init(struct iio_dev *indio_dev)
} }
/* Ring buffer functions - here trigger setup related */ /* Ring buffer functions - here trigger setup related */
indio_dev->ring->setup_ops = &ad7192_ring_setup_ops; indio_dev->buffer->setup_ops = &ad7192_ring_setup_ops;
/* Flag that polled ring buffering is possible */ /* Flag that polled ring buffering is possible */
indio_dev->modes |= INDIO_BUFFER_TRIGGERED; indio_dev->modes |= INDIO_BUFFER_TRIGGERED;
return 0; return 0;
error_deallocate_sw_rb: error_deallocate_sw_rb:
iio_sw_rb_free(indio_dev->ring); iio_sw_rb_free(indio_dev->buffer);
error_ret: error_ret:
return ret; return ret;
} }
...@@ -607,7 +607,7 @@ static int ad7192_register_ring_funcs_and_init(struct iio_dev *indio_dev) ...@@ -607,7 +607,7 @@ static int ad7192_register_ring_funcs_and_init(struct iio_dev *indio_dev)
static void ad7192_ring_cleanup(struct iio_dev *indio_dev) static void ad7192_ring_cleanup(struct iio_dev *indio_dev)
{ {
iio_dealloc_pollfunc(indio_dev->pollfunc); iio_dealloc_pollfunc(indio_dev->pollfunc);
iio_sw_rb_free(indio_dev->ring); iio_sw_rb_free(indio_dev->buffer);
} }
/** /**
...@@ -705,7 +705,7 @@ static ssize_t ad7192_write_frequency(struct device *dev, ...@@ -705,7 +705,7 @@ static ssize_t ad7192_write_frequency(struct device *dev,
return ret; return ret;
mutex_lock(&indio_dev->mlock); mutex_lock(&indio_dev->mlock);
if (iio_ring_enabled(indio_dev)) { if (iio_buffer_enabled(indio_dev)) {
mutex_unlock(&indio_dev->mlock); mutex_unlock(&indio_dev->mlock);
return -EBUSY; return -EBUSY;
} }
...@@ -790,7 +790,7 @@ static ssize_t ad7192_set(struct device *dev, ...@@ -790,7 +790,7 @@ static ssize_t ad7192_set(struct device *dev,
return ret; return ret;
mutex_lock(&indio_dev->mlock); mutex_lock(&indio_dev->mlock);
if (iio_ring_enabled(indio_dev)) { if (iio_buffer_enabled(indio_dev)) {
mutex_unlock(&indio_dev->mlock); mutex_unlock(&indio_dev->mlock);
return -EBUSY; return -EBUSY;
} }
...@@ -872,7 +872,7 @@ static int ad7192_read_raw(struct iio_dev *indio_dev, ...@@ -872,7 +872,7 @@ static int ad7192_read_raw(struct iio_dev *indio_dev,
switch (m) { switch (m) {
case 0: case 0:
mutex_lock(&indio_dev->mlock); mutex_lock(&indio_dev->mlock);
if (iio_ring_enabled(indio_dev)) if (iio_buffer_enabled(indio_dev))
ret = ad7192_scan_from_ring(st, ret = ad7192_scan_from_ring(st,
chan->scan_index, &smpl); chan->scan_index, &smpl);
else else
...@@ -929,7 +929,7 @@ static int ad7192_write_raw(struct iio_dev *indio_dev, ...@@ -929,7 +929,7 @@ static int ad7192_write_raw(struct iio_dev *indio_dev,
unsigned int tmp; unsigned int tmp;
mutex_lock(&indio_dev->mlock); mutex_lock(&indio_dev->mlock);
if (iio_ring_enabled(indio_dev)) { if (iio_buffer_enabled(indio_dev)) {
mutex_unlock(&indio_dev->mlock); mutex_unlock(&indio_dev->mlock);
return -EBUSY; return -EBUSY;
} }
...@@ -1099,9 +1099,9 @@ static int __devinit ad7192_probe(struct spi_device *spi) ...@@ -1099,9 +1099,9 @@ static int __devinit ad7192_probe(struct spi_device *spi)
if (ret) if (ret)
goto error_unreg_ring; goto error_unreg_ring;
ret = iio_ring_buffer_register(indio_dev, ret = iio_buffer_register(indio_dev,
indio_dev->channels, indio_dev->channels,
indio_dev->num_channels); indio_dev->num_channels);
if (ret) if (ret)
goto error_remove_trigger; goto error_remove_trigger;
...@@ -1112,7 +1112,7 @@ static int __devinit ad7192_probe(struct spi_device *spi) ...@@ -1112,7 +1112,7 @@ static int __devinit ad7192_probe(struct spi_device *spi)
return 0; return 0;
error_uninitialize_ring: error_uninitialize_ring:
iio_ring_buffer_unregister(indio_dev); iio_buffer_unregister(indio_dev);
error_remove_trigger: error_remove_trigger:
ad7192_remove_trigger(indio_dev); ad7192_remove_trigger(indio_dev);
error_unreg_ring: error_unreg_ring:
...@@ -1137,7 +1137,7 @@ static int ad7192_remove(struct spi_device *spi) ...@@ -1137,7 +1137,7 @@ static int ad7192_remove(struct spi_device *spi)
struct iio_dev *indio_dev = spi_get_drvdata(spi); struct iio_dev *indio_dev = spi_get_drvdata(spi);
struct ad7192_state *st = iio_priv(indio_dev); struct ad7192_state *st = iio_priv(indio_dev);
iio_ring_buffer_unregister(indio_dev); iio_buffer_unregister(indio_dev);
ad7192_remove_trigger(indio_dev); ad7192_remove_trigger(indio_dev);
ad7192_ring_cleanup(indio_dev); ad7192_ring_cleanup(indio_dev);
......
drivers/staging/iio/adc/ad7298_core.c
View file @ 14555b14
...@@ -122,7 +122,7 @@ static int ad7298_read_raw(struct iio_dev *dev_info, ...@@ -122,7 +122,7 @@ static int ad7298_read_raw(struct iio_dev *dev_info,
switch (m) { switch (m) {
case 0: case 0:
mutex_lock(&dev_info->mlock); mutex_lock(&dev_info->mlock);
if (iio_ring_enabled(dev_info)) { if (iio_buffer_enabled(dev_info)) {
if (chan->address == AD7298_CH_TEMP) if (chan->address == AD7298_CH_TEMP)
ret = -ENODEV; ret = -ENODEV;
else else
...@@ -218,9 +218,9 @@ static int __devinit ad7298_probe(struct spi_device *spi) ...@@ -218,9 +218,9 @@ static int __devinit ad7298_probe(struct spi_device *spi)
if (ret) if (ret)
goto error_disable_reg; goto error_disable_reg;
ret = iio_ring_buffer_register(indio_dev, ret = iio_buffer_register(indio_dev,
&ad7298_channels[1], /* skip temp0 */ &ad7298_channels[1], /* skip temp0 */
ARRAY_SIZE(ad7298_channels) - 1); ARRAY_SIZE(ad7298_channels) - 1);
if (ret) if (ret)
goto error_cleanup_ring; goto error_cleanup_ring;
ret = iio_device_register(indio_dev); ret = iio_device_register(indio_dev);
...@@ -230,7 +230,7 @@ static int __devinit ad7298_probe(struct spi_device *spi) ...@@ -230,7 +230,7 @@ static int __devinit ad7298_probe(struct spi_device *spi)
return 0; return 0;
error_unregister_ring: error_unregister_ring:
iio_ring_buffer_unregister(indio_dev); iio_buffer_unregister(indio_dev);
error_cleanup_ring: error_cleanup_ring:
ad7298_ring_cleanup(indio_dev); ad7298_ring_cleanup(indio_dev);
error_disable_reg: error_disable_reg:
...@@ -249,7 +249,7 @@ static int __devexit ad7298_remove(struct spi_device *spi) ...@@ -249,7 +249,7 @@ static int __devexit ad7298_remove(struct spi_device *spi)
struct iio_dev *indio_dev = spi_get_drvdata(spi); struct iio_dev *indio_dev = spi_get_drvdata(spi);
struct ad7298_state *st = iio_priv(indio_dev); struct ad7298_state *st = iio_priv(indio_dev);
iio_ring_buffer_unregister(indio_dev); iio_buffer_unregister(indio_dev);
ad7298_ring_cleanup(indio_dev); ad7298_ring_cleanup(indio_dev);
iio_device_unregister(indio_dev); iio_device_unregister(indio_dev);
if (!IS_ERR(st->reg)) { if (!IS_ERR(st->reg)) {
......
drivers/staging/iio/adc/ad7298_ring.c
View file @ 14555b14
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
int ad7298_scan_from_ring(struct iio_dev *dev_info, long ch) int ad7298_scan_from_ring(struct iio_dev *dev_info, long ch)
{ {
struct iio_ring_buffer *ring = dev_info->ring; struct iio_buffer *ring = dev_info->buffer;
int ret; int ret;
u16 *ring_data; u16 *ring_data;
...@@ -57,7 +57,7 @@ int ad7298_scan_from_ring(struct iio_dev *dev_info, long ch) ...@@ -57,7 +57,7 @@ int ad7298_scan_from_ring(struct iio_dev *dev_info, long ch)
static int ad7298_ring_preenable(struct iio_dev *indio_dev) static int ad7298_ring_preenable(struct iio_dev *indio_dev)
{ {
struct ad7298_state *st = iio_priv(indio_dev); struct ad7298_state *st = iio_priv(indio_dev);
struct iio_ring_buffer *ring = indio_dev->ring; struct iio_buffer *ring = indio_dev->buffer;
size_t d_size; size_t d_size;
int i, m; int i, m;
unsigned short command; unsigned short command;
...@@ -119,7 +119,7 @@ static irqreturn_t ad7298_trigger_handler(int irq, void *p) ...@@ -119,7 +119,7 @@ static irqreturn_t ad7298_trigger_handler(int irq, void *p)
struct iio_poll_func *pf = p; struct iio_poll_func *pf = p;
struct iio_dev *indio_dev = pf->indio_dev; struct iio_dev *indio_dev = pf->indio_dev;
struct ad7298_state *st = iio_priv(indio_dev); struct ad7298_state *st = iio_priv(indio_dev);
struct iio_ring_buffer *ring = indio_dev->ring; struct iio_buffer *ring = indio_dev->buffer;
s64 time_ns; s64 time_ns;
__u16 buf[16]; __u16 buf[16];
int b_sent, i; int b_sent, i;
...@@ -137,13 +137,13 @@ static irqreturn_t ad7298_trigger_handler(int irq, void *p) ...@@ -137,13 +137,13 @@ static irqreturn_t ad7298_trigger_handler(int irq, void *p)
for (i = 0; i < ring->scan_count; i++) for (i = 0; i < ring->scan_count; i++)
buf[i] = be16_to_cpu(st->rx_buf[i]); buf[i] = be16_to_cpu(st->rx_buf[i]);
indio_dev->ring->access->store_to(ring, (u8 *)buf, time_ns); indio_dev->buffer->access->store_to(ring, (u8 *)buf, time_ns);
iio_trigger_notify_done(indio_dev->trig); iio_trigger_notify_done(indio_dev->trig);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static const struct iio_ring_setup_ops ad7298_ring_setup_ops = { static const struct iio_buffer_setup_ops ad7298_ring_setup_ops = {
.preenable = &ad7298_ring_preenable, .preenable = &ad7298_ring_preenable,
.postenable = &iio_triggered_buffer_postenable, .postenable = &iio_triggered_buffer_postenable,
.predisable = &iio_triggered_buffer_predisable, .predisable = &iio_triggered_buffer_predisable,
...@@ -153,13 +153,13 @@ int ad7298_register_ring_funcs_and_init(struct iio_dev *indio_dev) ...@@ -153,13 +153,13 @@ int ad7298_register_ring_funcs_and_init(struct iio_dev *indio_dev)
{ {
int ret; int ret;
indio_dev->ring = iio_sw_rb_allocate(indio_dev); indio_dev->buffer = iio_sw_rb_allocate(indio_dev);
if (!indio_dev->ring) { if (!indio_dev->buffer) {
ret = -ENOMEM; ret = -ENOMEM;
goto error_ret; goto error_ret;
} }
/* Effectively select the ring buffer implementation */ /* Effectively select the ring buffer implementation */
indio_dev->ring->access = &ring_sw_access_funcs; indio_dev->buffer->access = &ring_sw_access_funcs;
indio_dev->pollfunc = iio_alloc_pollfunc(NULL, indio_dev->pollfunc = iio_alloc_pollfunc(NULL,
&ad7298_trigger_handler, &ad7298_trigger_handler,
...@@ -174,15 +174,15 @@ int ad7298_register_ring_funcs_and_init(struct iio_dev *indio_dev) ...@@ -174,15 +174,15 @@ int ad7298_register_ring_funcs_and_init(struct iio_dev *indio_dev)
} }
/* Ring buffer functions - here trigger setup related */ /* Ring buffer functions - here trigger setup related */
indio_dev->ring->setup_ops = &ad7298_ring_setup_ops; indio_dev->buffer->setup_ops = &ad7298_ring_setup_ops;
indio_dev->ring->scan_timestamp = true; indio_dev->buffer->scan_timestamp = true;
/* Flag that polled ring buffering is possible */ /* Flag that polled ring buffering is possible */
indio_dev->modes |= INDIO_BUFFER_TRIGGERED; indio_dev->modes |= INDIO_BUFFER_TRIGGERED;
return 0; return 0;
error_deallocate_sw_rb: error_deallocate_sw_rb:
iio_sw_rb_free(indio_dev->ring); iio_sw_rb_free(indio_dev->buffer);
error_ret: error_ret:
return ret; return ret;
} }
...@@ -190,5 +190,5 @@ int ad7298_register_ring_funcs_and_init(struct iio_dev *indio_dev) ...@@ -190,5 +190,5 @@ int ad7298_register_ring_funcs_and_init(struct iio_dev *indio_dev)
void ad7298_ring_cleanup(struct iio_dev *indio_dev) void ad7298_ring_cleanup(struct iio_dev *indio_dev)
{ {
iio_dealloc_pollfunc(indio_dev->pollfunc); iio_dealloc_pollfunc(indio_dev->pollfunc);
iio_sw_rb_free(indio_dev->ring); iio_sw_rb_free(indio_dev->buffer);
} }
drivers/staging/iio/adc/ad7476_core.c
View file @ 14555b14
...@@ -45,7 +45,7 @@ static int ad7476_read_raw(struct iio_dev *dev_info, ...@@ -45,7 +45,7 @@ static int ad7476_read_raw(struct iio_dev *dev_info,
switch (m) { switch (m) {
case 0: case 0:
mutex_lock(&dev_info->mlock); mutex_lock(&dev_info->mlock);
if (iio_ring_enabled(dev_info)) if (iio_buffer_enabled(dev_info))
ret = ad7476_scan_from_ring(dev_info); ret = ad7476_scan_from_ring(dev_info);
else else
ret = ad7476_scan_direct(st); ret = ad7476_scan_direct(st);
...@@ -179,9 +179,9 @@ static int __devinit ad7476_probe(struct spi_device *spi) ...@@ -179,9 +179,9 @@ static int __devinit ad7476_probe(struct spi_device *spi)
if (ret) if (ret)
goto error_disable_reg; goto error_disable_reg;
ret = iio_ring_buffer_register(indio_dev, ret = iio_buffer_register(indio_dev,
st->chip_info->channel, st->chip_info->channel,
ARRAY_SIZE(st->chip_info->channel)); ARRAY_SIZE(st->chip_info->channel));
if (ret) if (ret)
goto error_cleanup_ring; goto error_cleanup_ring;
...@@ -191,7 +191,7 @@ static int __devinit ad7476_probe(struct spi_device *spi) ...@@ -191,7 +191,7 @@ static int __devinit ad7476_probe(struct spi_device *spi)
return 0; return 0;
error_ring_unregister: error_ring_unregister:
iio_ring_buffer_unregister(indio_dev); iio_buffer_unregister(indio_dev);
error_cleanup_ring: error_cleanup_ring:
ad7476_ring_cleanup(indio_dev); ad7476_ring_cleanup(indio_dev);
error_disable_reg: error_disable_reg:
...@@ -211,7 +211,7 @@ static int ad7476_remove(struct spi_device *spi) ...@@ -211,7 +211,7 @@ static int ad7476_remove(struct spi_device *spi)
struct iio_dev *indio_dev = spi_get_drvdata(spi); struct iio_dev *indio_dev = spi_get_drvdata(spi);
struct ad7476_state *st = iio_priv(indio_dev); struct ad7476_state *st = iio_priv(indio_dev);
iio_ring_buffer_unregister(indio_dev); iio_buffer_unregister(indio_dev);
ad7476_ring_cleanup(indio_dev); ad7476_ring_cleanup(indio_dev);
if (!IS_ERR(st->reg)) { if (!IS_ERR(st->reg)) {
regulator_disable(st->reg); regulator_disable(st->reg);
......
drivers/staging/iio/adc/ad7476_ring.c
View file @ 14555b14
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
int ad7476_scan_from_ring(struct iio_dev *indio_dev) int ad7476_scan_from_ring(struct iio_dev *indio_dev)
{ {
struct iio_ring_buffer *ring = indio_dev->ring; struct iio_buffer *ring = indio_dev->buffer;
int ret; int ret;
u8 *ring_data; u8 *ring_data;
...@@ -54,7 +54,7 @@ int ad7476_scan_from_ring(struct iio_dev *indio_dev) ...@@ -54,7 +54,7 @@ int ad7476_scan_from_ring(struct iio_dev *indio_dev)
static int ad7476_ring_preenable(struct iio_dev *indio_dev) static int ad7476_ring_preenable(struct iio_dev *indio_dev)
{ {
struct ad7476_state *st = iio_priv(indio_dev); struct ad7476_state *st = iio_priv(indio_dev);
struct iio_ring_buffer *ring = indio_dev->ring; struct iio_buffer *ring = indio_dev->buffer;
st->d_size = ring->scan_count * st->d_size = ring->scan_count *
st->chip_info->channel[0].scan_type.storagebits / 8; st->chip_info->channel[0].scan_type.storagebits / 8;
...@@ -66,9 +66,9 @@ static int ad7476_ring_preenable(struct iio_dev *indio_dev) ...@@ -66,9 +66,9 @@ static int ad7476_ring_preenable(struct iio_dev *indio_dev)
st->d_size += sizeof(s64) - (st->d_size % sizeof(s64)); st->d_size += sizeof(s64) - (st->d_size % sizeof(s64));
} }
if (indio_dev->ring->access->set_bytes_per_datum) if (indio_dev->buffer->access->set_bytes_per_datum)
indio_dev->ring->access->set_bytes_per_datum(indio_dev->ring, indio_dev->buffer->access->
st->d_size); set_bytes_per_datum(indio_dev->buffer, st->d_size);
return 0; return 0;
} }
...@@ -93,11 +93,11 @@ static irqreturn_t ad7476_trigger_handler(int irq, void *p) ...@@ -93,11 +93,11 @@ static irqreturn_t ad7476_trigger_handler(int irq, void *p)
time_ns = iio_get_time_ns(); time_ns = iio_get_time_ns();
if (indio_dev->ring->scan_timestamp) if (indio_dev->buffer->scan_timestamp)
memcpy(rxbuf + st->d_size - sizeof(s64), memcpy(rxbuf + st->d_size - sizeof(s64),
&time_ns, sizeof(time_ns)); &time_ns, sizeof(time_ns));
indio_dev->ring->access->store_to(indio_dev->ring, rxbuf, time_ns); indio_dev->buffer->access->store_to(indio_dev->buffer, rxbuf, time_ns);
done: done:
iio_trigger_notify_done(indio_dev->trig); iio_trigger_notify_done(indio_dev->trig);
kfree(rxbuf); kfree(rxbuf);
...@@ -105,7 +105,7 @@ static irqreturn_t ad7476_trigger_handler(int irq, void *p) ...@@ -105,7 +105,7 @@ static irqreturn_t ad7476_trigger_handler(int irq, void *p)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static const struct iio_ring_setup_ops ad7476_ring_setup_ops = { static const struct iio_buffer_setup_ops ad7476_ring_setup_ops = {
.preenable = &ad7476_ring_preenable, .preenable = &ad7476_ring_preenable,
.postenable = &iio_triggered_buffer_postenable, .postenable = &iio_triggered_buffer_postenable,
.predisable = &iio_triggered_buffer_predisable, .predisable = &iio_triggered_buffer_predisable,
...@@ -116,13 +116,13 @@ int ad7476_register_ring_funcs_and_init(struct iio_dev *indio_dev) ...@@ -116,13 +116,13 @@ int ad7476_register_ring_funcs_and_init(struct iio_dev *indio_dev)
struct ad7476_state *st = iio_priv(indio_dev); struct ad7476_state *st = iio_priv(indio_dev);
int ret = 0; int ret = 0;
indio_dev->ring = iio_sw_rb_allocate(indio_dev); indio_dev->buffer = iio_sw_rb_allocate(indio_dev);
if (!indio_dev->ring) { if (!indio_dev->buffer) {
ret = -ENOMEM; ret = -ENOMEM;
goto error_ret; goto error_ret;
} }
/* Effectively select the ring buffer implementation */ /* Effectively select the ring buffer implementation */
indio_dev->ring->access = &ring_sw_access_funcs; indio_dev->buffer->access = &ring_sw_access_funcs;
indio_dev->pollfunc indio_dev->pollfunc
= iio_alloc_pollfunc(NULL, = iio_alloc_pollfunc(NULL,
&ad7476_trigger_handler, &ad7476_trigger_handler,
...@@ -137,15 +137,15 @@ int ad7476_register_ring_funcs_and_init(struct iio_dev *indio_dev) ...@@ -137,15 +137,15 @@ int ad7476_register_ring_funcs_and_init(struct iio_dev *indio_dev)
} }
/* Ring buffer functions - here trigger setup related */ /* Ring buffer functions - here trigger setup related */
indio_dev->ring->setup_ops = &ad7476_ring_setup_ops; indio_dev->buffer->setup_ops = &ad7476_ring_setup_ops;
indio_dev->ring->scan_timestamp = true; indio_dev->buffer->scan_timestamp = true;
/* Flag that polled ring buffering is possible */ /* Flag that polled ring buffering is possible */
indio_dev->modes |= INDIO_BUFFER_TRIGGERED; indio_dev->modes |= INDIO_BUFFER_TRIGGERED;
return 0; return 0;
error_deallocate_sw_rb: error_deallocate_sw_rb:
iio_sw_rb_free(indio_dev->ring); iio_sw_rb_free(indio_dev->buffer);
error_ret: error_ret:
return ret; return ret;
} }
...@@ -153,5 +153,5 @@ int ad7476_register_ring_funcs_and_init(struct iio_dev *indio_dev) ...@@ -153,5 +153,5 @@ int ad7476_register_ring_funcs_and_init(struct iio_dev *indio_dev)
void ad7476_ring_cleanup(struct iio_dev *indio_dev) void ad7476_ring_cleanup(struct iio_dev *indio_dev)
{ {
iio_dealloc_pollfunc(indio_dev->pollfunc); iio_dealloc_pollfunc(indio_dev->pollfunc);
iio_sw_rb_free(indio_dev->ring); iio_sw_rb_free(indio_dev->buffer);
} }
drivers/staging/iio/adc/ad7606_core.c
View file @ 14555b14
...@@ -90,7 +90,7 @@ static int ad7606_read_raw(struct iio_dev *indio_dev, ...@@ -90,7 +90,7 @@ static int ad7606_read_raw(struct iio_dev *indio_dev,
switch (m) { switch (m) {
case 0: case 0:
mutex_lock(&indio_dev->mlock); mutex_lock(&indio_dev->mlock);
if (iio_ring_enabled(indio_dev)) if (iio_buffer_enabled(indio_dev))
ret = ad7606_scan_from_ring(indio_dev, chan->address); ret = ad7606_scan_from_ring(indio_dev, chan->address);
else else
ret = ad7606_scan_direct(indio_dev, chan->address); ret = ad7606_scan_direct(indio_dev, chan->address);
...@@ -416,7 +416,7 @@ static irqreturn_t ad7606_interrupt(int irq, void *dev_id) ...@@ -416,7 +416,7 @@ static irqreturn_t ad7606_interrupt(int irq, void *dev_id)
struct iio_dev *indio_dev = dev_id; struct iio_dev *indio_dev = dev_id;
struct ad7606_state *st = iio_priv(indio_dev); struct ad7606_state *st = iio_priv(indio_dev);
if (iio_ring_enabled(indio_dev)) { if (iio_buffer_enabled(indio_dev)) {
if (!work_pending(&st->poll_work)) if (!work_pending(&st->poll_work))
schedule_work(&st->poll_work); schedule_work(&st->poll_work);
} else { } else {
...@@ -502,9 +502,9 @@ struct iio_dev *ad7606_probe(struct device *dev, int irq, ...@@ -502,9 +502,9 @@ struct iio_dev *ad7606_probe(struct device *dev, int irq,
if (ret) if (ret)
goto error_free_irq; goto error_free_irq;
ret = iio_ring_buffer_register(indio_dev, ret = iio_buffer_register(indio_dev,
indio_dev->channels, indio_dev->channels,
indio_dev->num_channels); indio_dev->num_channels);
if (ret) if (ret)
goto error_cleanup_ring; goto error_cleanup_ring;
ret = iio_device_register(indio_dev); ret = iio_device_register(indio_dev);
...@@ -513,7 +513,7 @@ struct iio_dev *ad7606_probe(struct device *dev, int irq, ...@@ -513,7 +513,7 @@ struct iio_dev *ad7606_probe(struct device *dev, int irq,
return indio_dev; return indio_dev;
error_unregister_ring: error_unregister_ring:
iio_ring_buffer_unregister(indio_dev); iio_buffer_unregister(indio_dev);
error_cleanup_ring: error_cleanup_ring:
ad7606_ring_cleanup(indio_dev); ad7606_ring_cleanup(indio_dev);
...@@ -539,7 +539,7 @@ int ad7606_remove(struct iio_dev *indio_dev) ...@@ -539,7 +539,7 @@ int ad7606_remove(struct iio_dev *indio_dev)
{ {
struct ad7606_state *st = iio_priv(indio_dev); struct ad7606_state *st = iio_priv(indio_dev);
iio_ring_buffer_unregister(indio_dev); iio_buffer_unregister(indio_dev);
ad7606_ring_cleanup(indio_dev); ad7606_ring_cleanup(indio_dev);
free_irq(st->irq, indio_dev); free_irq(st->irq, indio_dev);
......
drivers/staging/iio/adc/ad7606_ring.c
View file @ 14555b14
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
int ad7606_scan_from_ring(struct iio_dev *indio_dev, unsigned ch) int ad7606_scan_from_ring(struct iio_dev *indio_dev, unsigned ch)
{ {
struct iio_ring_buffer *ring = indio_dev->ring; struct iio_buffer *ring = indio_dev->buffer;
int ret; int ret;
u16 *ring_data; u16 *ring_data;
...@@ -52,7 +52,7 @@ int ad7606_scan_from_ring(struct iio_dev *indio_dev, unsigned ch) ...@@ -52,7 +52,7 @@ int ad7606_scan_from_ring(struct iio_dev *indio_dev, unsigned ch)
static int ad7606_ring_preenable(struct iio_dev *indio_dev) static int ad7606_ring_preenable(struct iio_dev *indio_dev)
{ {
struct ad7606_state *st = iio_priv(indio_dev); struct ad7606_state *st = iio_priv(indio_dev);
struct iio_ring_buffer *ring = indio_dev->ring; struct iio_buffer *ring = indio_dev->buffer;
size_t d_size; size_t d_size;
d_size = st->chip_info->num_channels * d_size = st->chip_info->num_channels *
...@@ -101,7 +101,7 @@ static void ad7606_poll_bh_to_ring(struct work_struct *work_s) ...@@ -101,7 +101,7 @@ static void ad7606_poll_bh_to_ring(struct work_struct *work_s)
struct ad7606_state *st = container_of(work_s, struct ad7606_state, struct ad7606_state *st = container_of(work_s, struct ad7606_state,
poll_work); poll_work);
struct iio_dev *indio_dev = iio_priv_to_dev(st); struct iio_dev *indio_dev = iio_priv_to_dev(st);
struct iio_ring_buffer *ring = indio_dev->ring; struct iio_buffer *ring = indio_dev->buffer;
s64 time_ns; s64 time_ns;
__u8 *buf; __u8 *buf;
int ret; int ret;
...@@ -140,14 +140,14 @@ static void ad7606_poll_bh_to_ring(struct work_struct *work_s) ...@@ -140,14 +140,14 @@ static void ad7606_poll_bh_to_ring(struct work_struct *work_s)
memcpy(buf + st->d_size - sizeof(s64), memcpy(buf + st->d_size - sizeof(s64),
&time_ns, sizeof(time_ns)); &time_ns, sizeof(time_ns));
ring->access->store_to(indio_dev->ring, buf, time_ns); ring->access->store_to(indio_dev->buffer, buf, time_ns);
done: done:
gpio_set_value(st->pdata->gpio_convst, 0); gpio_set_value(st->pdata->gpio_convst, 0);
iio_trigger_notify_done(indio_dev->trig); iio_trigger_notify_done(indio_dev->trig);
kfree(buf); kfree(buf);
} }
static const struct iio_ring_setup_ops ad7606_ring_setup_ops = { static const struct iio_buffer_setup_ops ad7606_ring_setup_ops = {
.preenable = &ad7606_ring_preenable, .preenable = &ad7606_ring_preenable,
.postenable = &iio_triggered_buffer_postenable, .postenable = &iio_triggered_buffer_postenable,
.predisable = &iio_triggered_buffer_predisable, .predisable = &iio_triggered_buffer_predisable,
...@@ -158,14 +158,14 @@ int ad7606_register_ring_funcs_and_init(struct iio_dev *indio_dev) ...@@ -158,14 +158,14 @@ int ad7606_register_ring_funcs_and_init(struct iio_dev *indio_dev)
struct ad7606_state *st = iio_priv(indio_dev); struct ad7606_state *st = iio_priv(indio_dev);
int ret; int ret;
indio_dev->ring = iio_sw_rb_allocate(indio_dev); indio_dev->buffer = iio_sw_rb_allocate(indio_dev);
if (!indio_dev->ring) { if (!indio_dev->buffer) {
ret = -ENOMEM; ret = -ENOMEM;
goto error_ret; goto error_ret;
} }
/* Effectively select the ring buffer implementation */ /* Effectively select the ring buffer implementation */
indio_dev->ring->access = &ring_sw_access_funcs; indio_dev->buffer->access = &ring_sw_access_funcs;
indio_dev->pollfunc = iio_alloc_pollfunc(&ad7606_trigger_handler_th_bh, indio_dev->pollfunc = iio_alloc_pollfunc(&ad7606_trigger_handler_th_bh,
&ad7606_trigger_handler_th_bh, &ad7606_trigger_handler_th_bh,
0, 0,
...@@ -180,8 +180,8 @@ int ad7606_register_ring_funcs_and_init(struct iio_dev *indio_dev) ...@@ -180,8 +180,8 @@ int ad7606_register_ring_funcs_and_init(struct iio_dev *indio_dev)
/* Ring buffer functions - here trigger setup related */ /* Ring buffer functions - here trigger setup related */
indio_dev->ring->setup_ops = &ad7606_ring_setup_ops; indio_dev->buffer->setup_ops = &ad7606_ring_setup_ops;
indio_dev->ring->scan_timestamp = true ; indio_dev->buffer->scan_timestamp = true ;
INIT_WORK(&st->poll_work, &ad7606_poll_bh_to_ring); INIT_WORK(&st->poll_work, &ad7606_poll_bh_to_ring);
...@@ -190,7 +190,7 @@ int ad7606_register_ring_funcs_and_init(struct iio_dev *indio_dev) ...@@ -190,7 +190,7 @@ int ad7606_register_ring_funcs_and_init(struct iio_dev *indio_dev)
return 0; return 0;
error_deallocate_sw_rb: error_deallocate_sw_rb:
iio_sw_rb_free(indio_dev->ring); iio_sw_rb_free(indio_dev->buffer);
error_ret: error_ret:
return ret; return ret;
} }
...@@ -198,5 +198,5 @@ int ad7606_register_ring_funcs_and_init(struct iio_dev *indio_dev) ...@@ -198,5 +198,5 @@ int ad7606_register_ring_funcs_and_init(struct iio_dev *indio_dev)
void ad7606_ring_cleanup(struct iio_dev *indio_dev) void ad7606_ring_cleanup(struct iio_dev *indio_dev)
{ {
iio_dealloc_pollfunc(indio_dev->pollfunc); iio_dealloc_pollfunc(indio_dev->pollfunc);
iio_sw_rb_free(indio_dev->ring); iio_sw_rb_free(indio_dev->buffer);
} }
drivers/staging/iio/adc/ad7793.c
View file @ 14555b14
...@@ -317,7 +317,7 @@ static int ad7793_setup(struct ad7793_state *st) ...@@ -317,7 +317,7 @@ static int ad7793_setup(struct ad7793_state *st)
static int ad7793_scan_from_ring(struct ad7793_state *st, unsigned ch, int *val) static int ad7793_scan_from_ring(struct ad7793_state *st, unsigned ch, int *val)
{ {
struct iio_ring_buffer *ring = iio_priv_to_dev(st)->ring; struct iio_buffer *ring = iio_priv_to_dev(st)->buffer;
int ret; int ret;
s64 dat64[2]; s64 dat64[2];
u32 *dat32 = (u32 *)dat64; u32 *dat32 = (u32 *)dat64;
...@@ -337,7 +337,7 @@ static int ad7793_scan_from_ring(struct ad7793_state *st, unsigned ch, int *val) ...@@ -337,7 +337,7 @@ static int ad7793_scan_from_ring(struct ad7793_state *st, unsigned ch, int *val)
static int ad7793_ring_preenable(struct iio_dev *indio_dev) static int ad7793_ring_preenable(struct iio_dev *indio_dev)
{ {
struct ad7793_state *st = iio_priv(indio_dev); struct ad7793_state *st = iio_priv(indio_dev);
struct iio_ring_buffer *ring = indio_dev->ring; struct iio_buffer *ring = indio_dev->buffer;
size_t d_size; size_t d_size;
unsigned channel; unsigned channel;
...@@ -357,9 +357,9 @@ static int ad7793_ring_preenable(struct iio_dev *indio_dev) ...@@ -357,9 +357,9 @@ static int ad7793_ring_preenable(struct iio_dev *indio_dev)
d_size += sizeof(s64) - (d_size % sizeof(s64)); d_size += sizeof(s64) - (d_size % sizeof(s64));
} }
if (indio_dev->ring->access->set_bytes_per_datum) if (indio_dev->buffer->access->set_bytes_per_datum)
indio_dev->ring->access->set_bytes_per_datum(indio_dev->ring, indio_dev->buffer->access->
d_size); set_bytes_per_datum(indio_dev->buffer, d_size);
st->mode = (st->mode & ~AD7793_MODE_SEL(-1)) | st->mode = (st->mode & ~AD7793_MODE_SEL(-1)) |
AD7793_MODE_SEL(AD7793_MODE_CONT); AD7793_MODE_SEL(AD7793_MODE_CONT);
...@@ -405,7 +405,7 @@ static irqreturn_t ad7793_trigger_handler(int irq, void *p) ...@@ -405,7 +405,7 @@ static irqreturn_t ad7793_trigger_handler(int irq, void *p)
{ {
struct iio_poll_func *pf = p; struct iio_poll_func *pf = p;
struct iio_dev *indio_dev = pf->indio_dev; struct iio_dev *indio_dev = pf->indio_dev;
struct iio_ring_buffer *ring = indio_dev->ring; struct iio_buffer *ring = indio_dev->buffer;
struct ad7793_state *st = iio_priv(indio_dev); struct ad7793_state *st = iio_priv(indio_dev);
s64 dat64[2]; s64 dat64[2];
s32 *dat32 = (s32 *)dat64; s32 *dat32 = (s32 *)dat64;
...@@ -428,7 +428,7 @@ static irqreturn_t ad7793_trigger_handler(int irq, void *p) ...@@ -428,7 +428,7 @@ static irqreturn_t ad7793_trigger_handler(int irq, void *p)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static const struct iio_ring_setup_ops ad7793_ring_setup_ops = { static const struct iio_buffer_setup_ops ad7793_ring_setup_ops = {
.preenable = &ad7793_ring_preenable, .preenable = &ad7793_ring_preenable,
.postenable = &iio_triggered_buffer_postenable, .postenable = &iio_triggered_buffer_postenable,
.predisable = &iio_triggered_buffer_predisable, .predisable = &iio_triggered_buffer_predisable,
...@@ -439,13 +439,13 @@ static int ad7793_register_ring_funcs_and_init(struct iio_dev *indio_dev) ...@@ -439,13 +439,13 @@ static int ad7793_register_ring_funcs_and_init(struct iio_dev *indio_dev)
{ {
int ret; int ret;
indio_dev->ring = iio_sw_rb_allocate(indio_dev); indio_dev->buffer = iio_sw_rb_allocate(indio_dev);
if (!indio_dev->ring) { if (!indio_dev->buffer) {
ret = -ENOMEM; ret = -ENOMEM;
goto error_ret; goto error_ret;
} }
/* Effectively select the ring buffer implementation */ /* Effectively select the ring buffer implementation */
indio_dev->ring->access = &ring_sw_access_funcs; indio_dev->buffer->access = &ring_sw_access_funcs;
indio_dev->pollfunc = iio_alloc_pollfunc(&iio_pollfunc_store_time, indio_dev->pollfunc = iio_alloc_pollfunc(&iio_pollfunc_store_time,
&ad7793_trigger_handler, &ad7793_trigger_handler,
IRQF_ONESHOT, IRQF_ONESHOT,
...@@ -458,14 +458,14 @@ static int ad7793_register_ring_funcs_and_init(struct iio_dev *indio_dev) ...@@ -458,14 +458,14 @@ static int ad7793_register_ring_funcs_and_init(struct iio_dev *indio_dev)
} }
/* Ring buffer functions - here trigger setup related */ /* Ring buffer functions - here trigger setup related */
indio_dev->ring->setup_ops = &ad7793_ring_setup_ops; indio_dev->buffer->setup_ops = &ad7793_ring_setup_ops;
/* Flag that polled ring buffering is possible */ /* Flag that polled ring buffering is possible */
indio_dev->modes |= INDIO_BUFFER_TRIGGERED; indio_dev->modes |= INDIO_BUFFER_TRIGGERED;
return 0; return 0;
error_deallocate_sw_rb: error_deallocate_sw_rb:
iio_sw_rb_free(indio_dev->ring); iio_sw_rb_free(indio_dev->buffer);
error_ret: error_ret:
return ret; return ret;
} }
...@@ -473,7 +473,7 @@ static int ad7793_register_ring_funcs_and_init(struct iio_dev *indio_dev) ...@@ -473,7 +473,7 @@ static int ad7793_register_ring_funcs_and_init(struct iio_dev *indio_dev)
static void ad7793_ring_cleanup(struct iio_dev *indio_dev) static void ad7793_ring_cleanup(struct iio_dev *indio_dev)
{ {
iio_dealloc_pollfunc(indio_dev->pollfunc); iio_dealloc_pollfunc(indio_dev->pollfunc);
iio_sw_rb_free(indio_dev->ring); iio_sw_rb_free(indio_dev->buffer);
} }
/** /**
...@@ -570,7 +570,7 @@ static ssize_t ad7793_write_frequency(struct device *dev, ...@@ -570,7 +570,7 @@ static ssize_t ad7793_write_frequency(struct device *dev,
int i, ret; int i, ret;
mutex_lock(&indio_dev->mlock); mutex_lock(&indio_dev->mlock);
if (iio_ring_enabled(indio_dev)) { if (iio_buffer_enabled(indio_dev)) {
mutex_unlock(&indio_dev->mlock); mutex_unlock(&indio_dev->mlock);
return -EBUSY; return -EBUSY;
} }
...@@ -647,7 +647,7 @@ static int ad7793_read_raw(struct iio_dev *indio_dev, ...@@ -647,7 +647,7 @@ static int ad7793_read_raw(struct iio_dev *indio_dev,
switch (m) { switch (m) {
case 0: case 0:
mutex_lock(&indio_dev->mlock); mutex_lock(&indio_dev->mlock);
if (iio_ring_enabled(indio_dev)) if (iio_buffer_enabled(indio_dev))
ret = ad7793_scan_from_ring(st, ret = ad7793_scan_from_ring(st,
chan->scan_index, &smpl); chan->scan_index, &smpl);
else else
...@@ -709,7 +709,7 @@ static int ad7793_write_raw(struct iio_dev *indio_dev, ...@@ -709,7 +709,7 @@ static int ad7793_write_raw(struct iio_dev *indio_dev,
unsigned int tmp; unsigned int tmp;
mutex_lock(&indio_dev->mlock); mutex_lock(&indio_dev->mlock);
if (iio_ring_enabled(indio_dev)) { if (iio_buffer_enabled(indio_dev)) {
mutex_unlock(&indio_dev->mlock); mutex_unlock(&indio_dev->mlock);
return -EBUSY; return -EBUSY;
} }
...@@ -974,9 +974,9 @@ static int __devinit ad7793_probe(struct spi_device *spi) ...@@ -974,9 +974,9 @@ static int __devinit ad7793_probe(struct spi_device *spi)
if (ret) if (ret)
goto error_unreg_ring; goto error_unreg_ring;
ret = iio_ring_buffer_register(indio_dev, ret = iio_buffer_register(indio_dev,
indio_dev->channels, indio_dev->channels,
indio_dev->num_channels); indio_dev->num_channels);
if (ret) if (ret)
goto error_remove_trigger; goto error_remove_trigger;
...@@ -991,7 +991,7 @@ static int __devinit ad7793_probe(struct spi_device *spi) ...@@ -991,7 +991,7 @@ static int __devinit ad7793_probe(struct spi_device *spi)
return 0; return 0;
error_uninitialize_ring: error_uninitialize_ring:
iio_ring_buffer_unregister(indio_dev); iio_buffer_unregister(indio_dev);
error_remove_trigger: error_remove_trigger:
ad7793_remove_trigger(indio_dev); ad7793_remove_trigger(indio_dev);
error_unreg_ring: error_unreg_ring:
...@@ -1013,7 +1013,7 @@ static int ad7793_remove(struct spi_device *spi) ...@@ -1013,7 +1013,7 @@ static int ad7793_remove(struct spi_device *spi)
struct iio_dev *indio_dev = spi_get_drvdata(spi); struct iio_dev *indio_dev = spi_get_drvdata(spi);
struct ad7793_state *st = iio_priv(indio_dev); struct ad7793_state *st = iio_priv(indio_dev);
iio_ring_buffer_unregister(indio_dev); iio_buffer_unregister(indio_dev);
ad7793_remove_trigger(indio_dev); ad7793_remove_trigger(indio_dev);
ad7793_ring_cleanup(indio_dev); ad7793_ring_cleanup(indio_dev);
......
drivers/staging/iio/adc/ad7887_core.c
View file @ 14555b14
...@@ -44,7 +44,7 @@ static int ad7887_read_raw(struct iio_dev *dev_info, ...@@ -44,7 +44,7 @@ static int ad7887_read_raw(struct iio_dev *dev_info,
switch (m) { switch (m) {
case 0: case 0:
mutex_lock(&dev_info->mlock); mutex_lock(&dev_info->mlock);
if (iio_ring_enabled(dev_info)) if (iio_buffer_enabled(dev_info))
ret = ad7887_scan_from_ring(st, 1 << chan->address); ret = ad7887_scan_from_ring(st, 1 << chan->address);
else else
ret = ad7887_scan_direct(st, chan->address); ret = ad7887_scan_direct(st, chan->address);
...@@ -189,9 +189,9 @@ static int __devinit ad7887_probe(struct spi_device *spi) ...@@ -189,9 +189,9 @@ static int __devinit ad7887_probe(struct spi_device *spi)
if (ret) if (ret)
goto error_disable_reg; goto error_disable_reg;
ret = iio_ring_buffer_register(indio_dev, ret = iio_buffer_register(indio_dev,
indio_dev->channels, indio_dev->channels,
indio_dev->num_channels); indio_dev->num_channels);
if (ret) if (ret)
goto error_cleanup_ring; goto error_cleanup_ring;
...@@ -201,7 +201,7 @@ static int __devinit ad7887_probe(struct spi_device *spi) ...@@ -201,7 +201,7 @@ static int __devinit ad7887_probe(struct spi_device *spi)
return 0; return 0;
error_unregister_ring: error_unregister_ring:
iio_ring_buffer_unregister(indio_dev); iio_buffer_unregister(indio_dev);
error_cleanup_ring: error_cleanup_ring:
ad7887_ring_cleanup(indio_dev); ad7887_ring_cleanup(indio_dev);
error_disable_reg: error_disable_reg:
...@@ -220,7 +220,7 @@ static int ad7887_remove(struct spi_device *spi) ...@@ -220,7 +220,7 @@ static int ad7887_remove(struct spi_device *spi)
struct iio_dev *indio_dev = spi_get_drvdata(spi); struct iio_dev *indio_dev = spi_get_drvdata(spi);
struct ad7887_state *st = iio_priv(indio_dev); struct ad7887_state *st = iio_priv(indio_dev);
iio_ring_buffer_unregister(indio_dev); iio_buffer_unregister(indio_dev);
ad7887_ring_cleanup(indio_dev); ad7887_ring_cleanup(indio_dev);
if (!IS_ERR(st->reg)) { if (!IS_ERR(st->reg)) {
regulator_disable(st->reg); regulator_disable(st->reg);
......
drivers/staging/iio/adc/ad7887_ring.c
View file @ 14555b14
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
int ad7887_scan_from_ring(struct ad7887_state *st, int channum) int ad7887_scan_from_ring(struct ad7887_state *st, int channum)
{ {
struct iio_ring_buffer *ring = iio_priv_to_dev(st)->ring; struct iio_buffer *ring = iio_priv_to_dev(st)->buffer;
int count = 0, ret; int count = 0, ret;
u16 *ring_data; u16 *ring_data;
...@@ -63,7 +63,7 @@ int ad7887_scan_from_ring(struct ad7887_state *st, int channum) ...@@ -63,7 +63,7 @@ int ad7887_scan_from_ring(struct ad7887_state *st, int channum)
static int ad7887_ring_preenable(struct iio_dev *indio_dev) static int ad7887_ring_preenable(struct iio_dev *indio_dev)
{ {
struct ad7887_state *st = iio_priv(indio_dev); struct ad7887_state *st = iio_priv(indio_dev);
struct iio_ring_buffer *ring = indio_dev->ring; struct iio_buffer *ring = indio_dev->buffer;
st->d_size = ring->scan_count * st->d_size = ring->scan_count *
st->chip_info->channel[0].scan_type.storagebits / 8; st->chip_info->channel[0].scan_type.storagebits / 8;
...@@ -75,9 +75,9 @@ static int ad7887_ring_preenable(struct iio_dev *indio_dev) ...@@ -75,9 +75,9 @@ static int ad7887_ring_preenable(struct iio_dev *indio_dev)
st->d_size += sizeof(s64) - (st->d_size % sizeof(s64)); st->d_size += sizeof(s64) - (st->d_size % sizeof(s64));
} }
if (indio_dev->ring->access->set_bytes_per_datum) if (indio_dev->buffer->access->set_bytes_per_datum)
indio_dev->ring->access->set_bytes_per_datum(indio_dev->ring, indio_dev->buffer->access->
st->d_size); set_bytes_per_datum(indio_dev->buffer, st->d_size);
/* We know this is a single long so can 'cheat' */ /* We know this is a single long so can 'cheat' */
switch (*ring->scan_mask) { switch (*ring->scan_mask) {
...@@ -116,7 +116,7 @@ static irqreturn_t ad7887_trigger_handler(int irq, void *p) ...@@ -116,7 +116,7 @@ static irqreturn_t ad7887_trigger_handler(int irq, void *p)
struct iio_poll_func *pf = p; struct iio_poll_func *pf = p;
struct iio_dev *indio_dev = pf->indio_dev; struct iio_dev *indio_dev = pf->indio_dev;
struct ad7887_state *st = iio_priv(indio_dev); struct ad7887_state *st = iio_priv(indio_dev);
struct iio_ring_buffer *ring = indio_dev->ring; struct iio_buffer *ring = indio_dev->buffer;
s64 time_ns; s64 time_ns;
__u8 *buf; __u8 *buf;
int b_sent; int b_sent;
...@@ -139,7 +139,7 @@ static irqreturn_t ad7887_trigger_handler(int irq, void *p) ...@@ -139,7 +139,7 @@ static irqreturn_t ad7887_trigger_handler(int irq, void *p)
memcpy(buf + st->d_size - sizeof(s64), memcpy(buf + st->d_size - sizeof(s64),
&time_ns, sizeof(time_ns)); &time_ns, sizeof(time_ns));
indio_dev->ring->access->store_to(indio_dev->ring, buf, time_ns); indio_dev->buffer->access->store_to(indio_dev->buffer, buf, time_ns);
done: done:
kfree(buf); kfree(buf);
iio_trigger_notify_done(indio_dev->trig); iio_trigger_notify_done(indio_dev->trig);
...@@ -147,7 +147,7 @@ static irqreturn_t ad7887_trigger_handler(int irq, void *p) ...@@ -147,7 +147,7 @@ static irqreturn_t ad7887_trigger_handler(int irq, void *p)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static const struct iio_ring_setup_ops ad7887_ring_setup_ops = { static const struct iio_buffer_setup_ops ad7887_ring_setup_ops = {
.preenable = &ad7887_ring_preenable, .preenable = &ad7887_ring_preenable,
.postenable = &iio_triggered_buffer_postenable, .postenable = &iio_triggered_buffer_postenable,
.predisable = &iio_triggered_buffer_predisable, .predisable = &iio_triggered_buffer_predisable,
...@@ -158,13 +158,13 @@ int ad7887_register_ring_funcs_and_init(struct iio_dev *indio_dev) ...@@ -158,13 +158,13 @@ int ad7887_register_ring_funcs_and_init(struct iio_dev *indio_dev)
{ {
int ret; int ret;
indio_dev->ring = iio_sw_rb_allocate(indio_dev); indio_dev->buffer = iio_sw_rb_allocate(indio_dev);
if (!indio_dev->ring) { if (!indio_dev->buffer) {
ret = -ENOMEM; ret = -ENOMEM;
goto error_ret; goto error_ret;
} }
/* Effectively select the ring buffer implementation */ /* Effectively select the ring buffer implementation */
indio_dev->ring->access = &ring_sw_access_funcs; indio_dev->buffer->access = &ring_sw_access_funcs;
indio_dev->pollfunc = iio_alloc_pollfunc(&iio_pollfunc_store_time, indio_dev->pollfunc = iio_alloc_pollfunc(&iio_pollfunc_store_time,
&ad7887_trigger_handler, &ad7887_trigger_handler,
IRQF_ONESHOT, IRQF_ONESHOT,
...@@ -176,14 +176,14 @@ int ad7887_register_ring_funcs_and_init(struct iio_dev *indio_dev) ...@@ -176,14 +176,14 @@ int ad7887_register_ring_funcs_and_init(struct iio_dev *indio_dev)
goto error_deallocate_sw_rb; goto error_deallocate_sw_rb;
} }
/* Ring buffer functions - here trigger setup related */ /* Ring buffer functions - here trigger setup related */
indio_dev->ring->setup_ops = &ad7887_ring_setup_ops; indio_dev->buffer->setup_ops = &ad7887_ring_setup_ops;
/* Flag that polled ring buffering is possible */ /* Flag that polled ring buffering is possible */
indio_dev->modes |= INDIO_BUFFER_TRIGGERED; indio_dev->modes |= INDIO_BUFFER_TRIGGERED;
return 0; return 0;
error_deallocate_sw_rb: error_deallocate_sw_rb:
iio_sw_rb_free(indio_dev->ring); iio_sw_rb_free(indio_dev->buffer);
error_ret: error_ret:
return ret; return ret;
} }
...@@ -191,5 +191,5 @@ int ad7887_register_ring_funcs_and_init(struct iio_dev *indio_dev) ...@@ -191,5 +191,5 @@ int ad7887_register_ring_funcs_and_init(struct iio_dev *indio_dev)
void ad7887_ring_cleanup(struct iio_dev *indio_dev) void ad7887_ring_cleanup(struct iio_dev *indio_dev)
{ {
iio_dealloc_pollfunc(indio_dev->pollfunc); iio_dealloc_pollfunc(indio_dev->pollfunc);
iio_sw_rb_free(indio_dev->ring); iio_sw_rb_free(indio_dev->buffer);
} }
drivers/staging/iio/adc/ad799x_core.c
View file @ 14555b14
...@@ -149,7 +149,7 @@ static int ad799x_read_raw(struct iio_dev *dev_info, ...@@ -149,7 +149,7 @@ static int ad799x_read_raw(struct iio_dev *dev_info,
switch (m) { switch (m) {
case 0: case 0:
mutex_lock(&dev_info->mlock); mutex_lock(&dev_info->mlock);
if (iio_ring_enabled(dev_info)) if (iio_buffer_enabled(dev_info))
ret = ad799x_single_channel_from_ring(st, ret = ad799x_single_channel_from_ring(st,
chan->address); chan->address);
else else
...@@ -701,9 +701,9 @@ static int __devinit ad799x_probe(struct i2c_client *client, ...@@ -701,9 +701,9 @@ static int __devinit ad799x_probe(struct i2c_client *client,
if (ret) if (ret)
goto error_disable_reg; goto error_disable_reg;
ret = iio_ring_buffer_register(indio_dev, ret = iio_buffer_register(indio_dev,
indio_dev->channels, indio_dev->channels,
indio_dev->num_channels); indio_dev->num_channels);
if (ret) if (ret)
goto error_cleanup_ring; goto error_cleanup_ring;
...@@ -747,7 +747,7 @@ static __devexit int ad799x_remove(struct i2c_client *client) ...@@ -747,7 +747,7 @@ static __devexit int ad799x_remove(struct i2c_client *client)
if (client->irq > 0) if (client->irq > 0)
free_irq(client->irq, indio_dev); free_irq(client->irq, indio_dev);
iio_ring_buffer_unregister(indio_dev); iio_buffer_unregister(indio_dev);
ad799x_ring_cleanup(indio_dev); ad799x_ring_cleanup(indio_dev);
if (!IS_ERR(st->reg)) { if (!IS_ERR(st->reg)) {
regulator_disable(st->reg); regulator_disable(st->reg);
......
drivers/staging/iio/adc/ad799x_ring.c
View file @ 14555b14
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
int ad799x_single_channel_from_ring(struct ad799x_state *st, int channum) int ad799x_single_channel_from_ring(struct ad799x_state *st, int channum)
{ {
struct iio_ring_buffer *ring = iio_priv_to_dev(st)->ring; struct iio_buffer *ring = iio_priv_to_dev(st)->buffer;
int count = 0, ret; int count = 0, ret;
u16 *ring_data; u16 *ring_data;
...@@ -62,7 +62,7 @@ int ad799x_single_channel_from_ring(struct ad799x_state *st, int channum) ...@@ -62,7 +62,7 @@ int ad799x_single_channel_from_ring(struct ad799x_state *st, int channum)
**/ **/
static int ad799x_ring_preenable(struct iio_dev *indio_dev) static int ad799x_ring_preenable(struct iio_dev *indio_dev)
{ {
struct iio_ring_buffer *ring = indio_dev->ring; struct iio_buffer *ring = indio_dev->buffer;
struct ad799x_state *st = iio_priv(indio_dev); struct ad799x_state *st = iio_priv(indio_dev);
/* /*
...@@ -82,9 +82,9 @@ static int ad799x_ring_preenable(struct iio_dev *indio_dev) ...@@ -82,9 +82,9 @@ static int ad799x_ring_preenable(struct iio_dev *indio_dev)
st->d_size += sizeof(s64) - (st->d_size % sizeof(s64)); st->d_size += sizeof(s64) - (st->d_size % sizeof(s64));
} }
if (indio_dev->ring->access->set_bytes_per_datum) if (indio_dev->buffer->access->set_bytes_per_datum)
indio_dev->ring->access->set_bytes_per_datum(indio_dev->ring, indio_dev->buffer->access->
st->d_size); set_bytes_per_datum(indio_dev->buffer, st->d_size);
return 0; return 0;
} }
...@@ -101,7 +101,7 @@ static irqreturn_t ad799x_trigger_handler(int irq, void *p) ...@@ -101,7 +101,7 @@ static irqreturn_t ad799x_trigger_handler(int irq, void *p)
struct iio_poll_func *pf = p; struct iio_poll_func *pf = p;
struct iio_dev *indio_dev = pf->indio_dev; struct iio_dev *indio_dev = pf->indio_dev;
struct ad799x_state *st = iio_priv(indio_dev); struct ad799x_state *st = iio_priv(indio_dev);
struct iio_ring_buffer *ring = indio_dev->ring; struct iio_buffer *ring = indio_dev->buffer;
s64 time_ns; s64 time_ns;
__u8 *rxbuf; __u8 *rxbuf;
int b_sent; int b_sent;
...@@ -142,7 +142,7 @@ static irqreturn_t ad799x_trigger_handler(int irq, void *p) ...@@ -142,7 +142,7 @@ static irqreturn_t ad799x_trigger_handler(int irq, void *p)
memcpy(rxbuf + st->d_size - sizeof(s64), memcpy(rxbuf + st->d_size - sizeof(s64),
&time_ns, sizeof(time_ns)); &time_ns, sizeof(time_ns));
ring->access->store_to(indio_dev->ring, rxbuf, time_ns); ring->access->store_to(indio_dev->buffer, rxbuf, time_ns);
done: done:
kfree(rxbuf); kfree(rxbuf);
if (b_sent < 0) if (b_sent < 0)
...@@ -153,7 +153,7 @@ static irqreturn_t ad799x_trigger_handler(int irq, void *p) ...@@ -153,7 +153,7 @@ static irqreturn_t ad799x_trigger_handler(int irq, void *p)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static const struct iio_ring_setup_ops ad799x_buf_setup_ops = { static const struct iio_buffer_setup_ops ad799x_buf_setup_ops = {
.preenable = &ad799x_ring_preenable, .preenable = &ad799x_ring_preenable,
.postenable = &iio_triggered_buffer_postenable, .postenable = &iio_triggered_buffer_postenable,
.predisable = &iio_triggered_buffer_predisable, .predisable = &iio_triggered_buffer_predisable,
...@@ -163,13 +163,13 @@ int ad799x_register_ring_funcs_and_init(struct iio_dev *indio_dev) ...@@ -163,13 +163,13 @@ int ad799x_register_ring_funcs_and_init(struct iio_dev *indio_dev)
{ {
int ret = 0; int ret = 0;
indio_dev->ring = iio_sw_rb_allocate(indio_dev); indio_dev->buffer = iio_sw_rb_allocate(indio_dev);
if (!indio_dev->ring) { if (!indio_dev->buffer) {
ret = -ENOMEM; ret = -ENOMEM;
goto error_ret; goto error_ret;
} }
/* Effectively select the ring buffer implementation */ /* Effectively select the ring buffer implementation */
indio_dev->ring->access = &ring_sw_access_funcs; indio_dev->buffer->access = &ring_sw_access_funcs;
indio_dev->pollfunc = iio_alloc_pollfunc(NULL, indio_dev->pollfunc = iio_alloc_pollfunc(NULL,
&ad799x_trigger_handler, &ad799x_trigger_handler,
IRQF_ONESHOT, IRQF_ONESHOT,
...@@ -183,15 +183,15 @@ int ad799x_register_ring_funcs_and_init(struct iio_dev *indio_dev) ...@@ -183,15 +183,15 @@ int ad799x_register_ring_funcs_and_init(struct iio_dev *indio_dev)
} }
/* Ring buffer functions - here trigger setup related */ /* Ring buffer functions - here trigger setup related */
indio_dev->ring->setup_ops = &ad799x_buf_setup_ops; indio_dev->buffer->setup_ops = &ad799x_buf_setup_ops;
indio_dev->ring->scan_timestamp = true; indio_dev->buffer->scan_timestamp = true;
/* Flag that polled ring buffering is possible */ /* Flag that polled ring buffering is possible */
indio_dev->modes |= INDIO_BUFFER_TRIGGERED; indio_dev->modes |= INDIO_BUFFER_TRIGGERED;
return 0; return 0;
error_deallocate_sw_rb: error_deallocate_sw_rb:
iio_sw_rb_free(indio_dev->ring); iio_sw_rb_free(indio_dev->buffer);
error_ret: error_ret:
return ret; return ret;
} }
...@@ -199,5 +199,5 @@ int ad799x_register_ring_funcs_and_init(struct iio_dev *indio_dev) ...@@ -199,5 +199,5 @@ int ad799x_register_ring_funcs_and_init(struct iio_dev *indio_dev)
void ad799x_ring_cleanup(struct iio_dev *indio_dev) void ad799x_ring_cleanup(struct iio_dev *indio_dev)
{ {
iio_dealloc_pollfunc(indio_dev->pollfunc); iio_dealloc_pollfunc(indio_dev->pollfunc);
iio_sw_rb_free(indio_dev->ring); iio_sw_rb_free(indio_dev->buffer);
} }
drivers/staging/iio/adc/max1363_core.c
View file @ 14555b14
...@@ -205,7 +205,7 @@ static int max1363_read_single_chan(struct iio_dev *indio_dev, ...@@ -205,7 +205,7 @@ static int max1363_read_single_chan(struct iio_dev *indio_dev,
} }
/* If ring buffer capture is occurring, query the buffer */ /* If ring buffer capture is occurring, query the buffer */
if (iio_ring_enabled(indio_dev)) { if (iio_buffer_enabled(indio_dev)) {
mask = max1363_mode_table[chan->address].modemask; mask = max1363_mode_table[chan->address].modemask;
data = max1363_single_channel_from_ring(mask, st); data = max1363_single_channel_from_ring(mask, st);
if (data < 0) { if (data < 0) {
...@@ -1292,9 +1292,9 @@ static int __devinit max1363_probe(struct i2c_client *client, ...@@ -1292,9 +1292,9 @@ static int __devinit max1363_probe(struct i2c_client *client,
if (ret) if (ret)
goto error_free_available_scan_masks; goto error_free_available_scan_masks;
ret = iio_ring_buffer_register(indio_dev, ret = iio_buffer_register(indio_dev,
st->chip_info->channels, st->chip_info->channels,
st->chip_info->num_channels); st->chip_info->num_channels);
if (ret) if (ret)
goto error_cleanup_ring; goto error_cleanup_ring;
...@@ -1318,7 +1318,7 @@ static int __devinit max1363_probe(struct i2c_client *client, ...@@ -1318,7 +1318,7 @@ static int __devinit max1363_probe(struct i2c_client *client,
error_free_irq: error_free_irq:
free_irq(st->client->irq, indio_dev); free_irq(st->client->irq, indio_dev);
error_uninit_ring: error_uninit_ring:
iio_ring_buffer_unregister(indio_dev); iio_buffer_unregister(indio_dev);
error_cleanup_ring: error_cleanup_ring:
max1363_ring_cleanup(indio_dev); max1363_ring_cleanup(indio_dev);
error_free_available_scan_masks: error_free_available_scan_masks:
...@@ -1341,7 +1341,7 @@ static int max1363_remove(struct i2c_client *client) ...@@ -1341,7 +1341,7 @@ static int max1363_remove(struct i2c_client *client)
if (client->irq) if (client->irq)
free_irq(st->client->irq, indio_dev); free_irq(st->client->irq, indio_dev);
iio_ring_buffer_unregister(indio_dev); iio_buffer_unregister(indio_dev);
max1363_ring_cleanup(indio_dev); max1363_ring_cleanup(indio_dev);
kfree(indio_dev->available_scan_masks); kfree(indio_dev->available_scan_masks);
if (!IS_ERR(reg)) { if (!IS_ERR(reg)) {
......
drivers/staging/iio/adc/max1363_ring.c
View file @ 14555b14
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
int max1363_single_channel_from_ring(const long *mask, struct max1363_state *st) int max1363_single_channel_from_ring(const long *mask, struct max1363_state *st)
{ {
struct iio_ring_buffer *ring = iio_priv_to_dev(st)->ring; struct iio_buffer *ring = iio_priv_to_dev(st)->buffer;
int count = 0, ret, index; int count = 0, ret, index;
u8 *ring_data; u8 *ring_data;
index = find_first_bit(mask, MAX1363_MAX_CHANNELS); index = find_first_bit(mask, MAX1363_MAX_CHANNELS);
...@@ -68,7 +68,7 @@ int max1363_single_channel_from_ring(const long *mask, struct max1363_state *st) ...@@ -68,7 +68,7 @@ int max1363_single_channel_from_ring(const long *mask, struct max1363_state *st)
static int max1363_ring_preenable(struct iio_dev *indio_dev) static int max1363_ring_preenable(struct iio_dev *indio_dev)
{ {
struct max1363_state *st = iio_priv(indio_dev); struct max1363_state *st = iio_priv(indio_dev);
struct iio_ring_buffer *ring = indio_dev->ring; struct iio_buffer *ring = indio_dev->buffer;
size_t d_size = 0; size_t d_size = 0;
unsigned long numvals; unsigned long numvals;
...@@ -141,7 +141,7 @@ static irqreturn_t max1363_trigger_handler(int irq, void *p) ...@@ -141,7 +141,7 @@ static irqreturn_t max1363_trigger_handler(int irq, void *p)
memcpy(rxbuf + d_size - sizeof(s64), &time_ns, sizeof(time_ns)); memcpy(rxbuf + d_size - sizeof(s64), &time_ns, sizeof(time_ns));
indio_dev->ring->access->store_to(indio_dev->ring, rxbuf, time_ns); indio_dev->buffer->access->store_to(indio_dev->buffer, rxbuf, time_ns);
done: done:
iio_trigger_notify_done(indio_dev->trig); iio_trigger_notify_done(indio_dev->trig);
kfree(rxbuf); kfree(rxbuf);
...@@ -149,7 +149,7 @@ static irqreturn_t max1363_trigger_handler(int irq, void *p) ...@@ -149,7 +149,7 @@ static irqreturn_t max1363_trigger_handler(int irq, void *p)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static const struct iio_ring_setup_ops max1363_ring_setup_ops = { static const struct iio_buffer_setup_ops max1363_ring_setup_ops = {
.postenable = &iio_triggered_buffer_postenable, .postenable = &iio_triggered_buffer_postenable,
.preenable = &max1363_ring_preenable, .preenable = &max1363_ring_preenable,
.predisable = &iio_triggered_buffer_predisable, .predisable = &iio_triggered_buffer_predisable,
...@@ -160,8 +160,8 @@ int max1363_register_ring_funcs_and_init(struct iio_dev *indio_dev) ...@@ -160,8 +160,8 @@ int max1363_register_ring_funcs_and_init(struct iio_dev *indio_dev)
struct max1363_state *st = iio_priv(indio_dev); struct max1363_state *st = iio_priv(indio_dev);
int ret = 0; int ret = 0;
indio_dev->ring = iio_sw_rb_allocate(indio_dev); indio_dev->buffer = iio_sw_rb_allocate(indio_dev);
if (!indio_dev->ring) { if (!indio_dev->buffer) {
ret = -ENOMEM; ret = -ENOMEM;
goto error_ret; goto error_ret;
} }
...@@ -177,9 +177,9 @@ int max1363_register_ring_funcs_and_init(struct iio_dev *indio_dev) ...@@ -177,9 +177,9 @@ int max1363_register_ring_funcs_and_init(struct iio_dev *indio_dev)
goto error_deallocate_sw_rb; goto error_deallocate_sw_rb;
} }
/* Effectively select the ring buffer implementation */ /* Effectively select the ring buffer implementation */
indio_dev->ring->access = &ring_sw_access_funcs; indio_dev->buffer->access = &ring_sw_access_funcs;
/* Ring buffer functions - here trigger setup related */ /* Ring buffer functions - here trigger setup related */
indio_dev->ring->setup_ops = &max1363_ring_setup_ops; indio_dev->buffer->setup_ops = &max1363_ring_setup_ops;
/* Flag that polled ring buffering is possible */ /* Flag that polled ring buffering is possible */
indio_dev->modes |= INDIO_BUFFER_TRIGGERED; indio_dev->modes |= INDIO_BUFFER_TRIGGERED;
...@@ -187,7 +187,7 @@ int max1363_register_ring_funcs_and_init(struct iio_dev *indio_dev) ...@@ -187,7 +187,7 @@ int max1363_register_ring_funcs_and_init(struct iio_dev *indio_dev)
return 0; return 0;
error_deallocate_sw_rb: error_deallocate_sw_rb:
iio_sw_rb_free(indio_dev->ring); iio_sw_rb_free(indio_dev->buffer);
error_ret: error_ret:
return ret; return ret;
} }
...@@ -196,5 +196,5 @@ void max1363_ring_cleanup(struct iio_dev *indio_dev) ...@@ -196,5 +196,5 @@ void max1363_ring_cleanup(struct iio_dev *indio_dev)
{ {
/* ensure that the trigger has been detached */ /* ensure that the trigger has been detached */
iio_dealloc_pollfunc(indio_dev->pollfunc); iio_dealloc_pollfunc(indio_dev->pollfunc);
iio_sw_rb_free(indio_dev->ring); iio_sw_rb_free(indio_dev->buffer);
} }
drivers/staging/iio/buffer_generic.h
View file @ 14555b14
/* The industrial I/O core - generic ring buffer interfaces. /* The industrial I/O core - generic buffer interfaces.
* *
* Copyright (c) 2008 Jonathan Cameron * Copyright (c) 2008 Jonathan Cameron
* *
...@@ -15,65 +15,66 @@ ...@@ -15,65 +15,66 @@
#ifdef CONFIG_IIO_BUFFER #ifdef CONFIG_IIO_BUFFER
struct iio_ring_buffer; struct iio_buffer;
/** /**
* struct iio_ring_access_funcs - access functions for ring buffers. * struct iio_buffer_access_funcs - access functions for buffers.
* @mark_in_use: reference counting, typically to prevent module removal * @mark_in_use: reference counting, typically to prevent module removal
* @unmark_in_use: reduce reference count when no longer using ring buffer * @unmark_in_use: reduce reference count when no longer using buffer
* @store_to: actually store stuff to the ring buffer * @store_to: actually store stuff to the buffer
* @read_last: get the last element stored * @read_last: get the last element stored
* @read_first_n: try to get a specified number of elements (must exist) * @read_first_n: try to get a specified number of elements (must exist)
* @mark_param_change: notify ring that some relevant parameter has changed * @mark_param_change: notify buffer that some relevant parameter has changed
* Often this means the underlying storage may need to * Often this means the underlying storage may need to
* change. * change.
* @request_update: if a parameter change has been marked, update underlying * @request_update: if a parameter change has been marked, update underlying
* storage. * storage.
* @get_bytes_per_datum:get current bytes per datum * @get_bytes_per_datum:get current bytes per datum
* @set_bytes_per_datum:set number of bytes per datum * @set_bytes_per_datum:set number of bytes per datum
* @get_length: get number of datums in ring * @get_length: get number of datums in buffer
* @set_length: set number of datums in ring * @set_length: set number of datums in buffer
* @is_enabled: query if ring is currently being used * @is_enabled: query if buffer is currently being used
* @enable: enable the ring * @enable: enable the buffer
* *
* The purpose of this structure is to make the ring buffer element * The purpose of this structure is to make the buffer element
* modular as event for a given driver, different usecases may require * modular as event for a given driver, different usecases may require
* different ring designs (space efficiency vs speed for example). * different buffer designs (space efficiency vs speed for example).
* *
* It is worth noting that a given ring implementation may only support a small * It is worth noting that a given buffer implementation may only support a
* proportion of these functions. The core code 'should' cope fine with any of * small proportion of these functions. The core code 'should' cope fine with
* them not existing. * any of them not existing.
**/ **/
struct iio_ring_access_funcs { struct iio_buffer_access_funcs {
void (*mark_in_use)(struct iio_ring_buffer *ring); void (*mark_in_use)(struct iio_buffer *buffer);
void (*unmark_in_use)(struct iio_ring_buffer *ring); void (*unmark_in_use)(struct iio_buffer *buffer);
int (*store_to)(struct iio_ring_buffer *ring, u8 *data, s64 timestamp); int (*store_to)(struct iio_buffer *buffer, u8 *data, s64 timestamp);
int (*read_last)(struct iio_ring_buffer *ring, u8 *data); int (*read_last)(struct iio_buffer *buffer, u8 *data);
int (*read_first_n)(struct iio_ring_buffer *ring, int (*read_first_n)(struct iio_buffer *buffer,
size_t n, size_t n,
char __user *buf); char __user *buf);
int (*mark_param_change)(struct iio_ring_buffer *ring); int (*mark_param_change)(struct iio_buffer *buffer);
int (*request_update)(struct iio_ring_buffer *ring); int (*request_update)(struct iio_buffer *buffer);
int (*get_bytes_per_datum)(struct iio_ring_buffer *ring); int (*get_bytes_per_datum)(struct iio_buffer *buffer);
int (*set_bytes_per_datum)(struct iio_ring_buffer *ring, size_t bpd); int (*set_bytes_per_datum)(struct iio_buffer *buffer, size_t bpd);
int (*get_length)(struct iio_ring_buffer *ring); int (*get_length)(struct iio_buffer *buffer);
int (*set_length)(struct iio_ring_buffer *ring, int length); int (*set_length)(struct iio_buffer *buffer, int length);
int (*is_enabled)(struct iio_ring_buffer *ring); int (*is_enabled)(struct iio_buffer *buffer);
int (*enable)(struct iio_ring_buffer *ring); int (*enable)(struct iio_buffer *buffer);
}; };
/** /**
* struct iio_ring_setup_ops - buffer setup related callbacks * struct iio_buffer_setup_ops - buffer setup related callbacks
* @preenable: [DRIVER] function to run prior to marking ring enabled * @preenable: [DRIVER] function to run prior to marking buffer enabled
* @postenable: [DRIVER] function to run after marking ring enabled * @postenable: [DRIVER] function to run after marking buffer enabled
* @predisable: [DRIVER] function to run prior to marking ring disabled * @predisable: [DRIVER] function to run prior to marking buffer
* @postdisable: [DRIVER] function to run after marking ring disabled * disabled
* @postdisable: [DRIVER] function to run after marking buffer disabled
*/ */
struct iio_ring_setup_ops { struct iio_buffer_setup_ops {
int (*preenable)(struct iio_dev *); int (*preenable)(struct iio_dev *);
int (*postenable)(struct iio_dev *); int (*postenable)(struct iio_dev *);
int (*predisable)(struct iio_dev *); int (*predisable)(struct iio_dev *);
...@@ -81,11 +82,10 @@ struct iio_ring_setup_ops { ...@@ -81,11 +82,10 @@ struct iio_ring_setup_ops {
}; };
/** /**
* struct iio_ring_buffer - general ring buffer structure * struct iio_buffer - general buffer structure
* @dev: ring buffer device struct
* @indio_dev: industrial I/O device structure * @indio_dev: industrial I/O device structure
* @owner: module that owns the ring buffer (for ref counting) * @owner: module that owns the buffer (for ref counting)
* @length: [DEVICE] number of datums in ring * @length: [DEVICE] number of datums in buffer
* @bytes_per_datum: [DEVICE] size of individual datum including timestamp * @bytes_per_datum: [DEVICE] size of individual datum including timestamp
* @bpe: [DEVICE] size of individual channel value * @bpe: [DEVICE] size of individual channel value
* @scan_el_attrs: [DRIVER] control of scan elements if that scan mode * @scan_el_attrs: [DRIVER] control of scan elements if that scan mode
...@@ -93,11 +93,11 @@ struct iio_ring_setup_ops { ...@@ -93,11 +93,11 @@ struct iio_ring_setup_ops {
* @scan_count: [INTERN] the number of elements in the current scan mode * @scan_count: [INTERN] the number of elements in the current scan mode
* @scan_mask: [INTERN] bitmask used in masking scan mode elements * @scan_mask: [INTERN] bitmask used in masking scan mode elements
* @scan_timestamp: [INTERN] does the scan mode include a timestamp * @scan_timestamp: [INTERN] does the scan mode include a timestamp
* @access: [DRIVER] ring access functions associated with the * @access: [DRIVER] buffer access functions associated with the
* implementation. * implementation.
* @flags: [INTERN] file ops related flags including busy flag. * @flags: [INTERN] file ops related flags including busy flag.
**/ **/
struct iio_ring_buffer { struct iio_buffer {
struct iio_dev *indio_dev; struct iio_dev *indio_dev;
struct module *owner; struct module *owner;
int length; int length;
...@@ -107,8 +107,8 @@ struct iio_ring_buffer { ...@@ -107,8 +107,8 @@ struct iio_ring_buffer {
int scan_count; int scan_count;
long *scan_mask; long *scan_mask;
bool scan_timestamp; bool scan_timestamp;
const struct iio_ring_access_funcs *access; const struct iio_buffer_access_funcs *access;
const struct iio_ring_setup_ops *setup_ops; const struct iio_buffer_setup_ops *setup_ops;
struct list_head scan_el_dev_attr_list; struct list_head scan_el_dev_attr_list;
struct attribute_group scan_el_group; struct attribute_group scan_el_group;
wait_queue_head_t pollq; wait_queue_head_t pollq;
...@@ -118,107 +118,109 @@ struct iio_ring_buffer { ...@@ -118,107 +118,109 @@ struct iio_ring_buffer {
}; };
/** /**
* iio_ring_buffer_init() - Initialize the buffer structure * iio_buffer_init() - Initialize the buffer structure
* @ring: buffer to be initialized * @buffer: buffer to be initialized
* @dev_info: the iio device the buffer is assocated with * @dev_info: the iio device the buffer is assocated with
**/ **/
void iio_ring_buffer_init(struct iio_ring_buffer *ring, void iio_buffer_init(struct iio_buffer *buffer,
struct iio_dev *dev_info); struct iio_dev *dev_info);
void iio_ring_buffer_deinit(struct iio_ring_buffer *ring); void iio_buffer_deinit(struct iio_buffer *buffer);
/** /**
* __iio_update_ring_buffer() - update common elements of ring buffers * __iio_update_buffer() - update common elements of buffers
* @ring: ring buffer that is the event source * @buffer: buffer that is the event source
* @bytes_per_datum: size of individual datum including timestamp * @bytes_per_datum: size of individual datum including timestamp
* @length: number of datums in ring * @length: number of datums in buffer
**/ **/
static inline void __iio_update_ring_buffer(struct iio_ring_buffer *ring, static inline void __iio_update_buffer(struct iio_buffer *buffer,
int bytes_per_datum, int length) int bytes_per_datum, int length)
{ {
ring->bytes_per_datum = bytes_per_datum; buffer->bytes_per_datum = bytes_per_datum;
ring->length = length; buffer->length = length;
} }
int iio_scan_mask_query(struct iio_ring_buffer *ring, int bit); int iio_scan_mask_query(struct iio_buffer *buffer, int bit);
/** /**
* iio_scan_mask_set() - set particular bit in the scan mask * iio_scan_mask_set() - set particular bit in the scan mask
* @ring: the ring buffer whose scan mask we are interested in * @buffer: the buffer whose scan mask we are interested in
* @bit: the bit to be set. * @bit: the bit to be set.
**/ **/
int iio_scan_mask_set(struct iio_ring_buffer *ring, int bit); int iio_scan_mask_set(struct iio_buffer *buffer, int bit);
#define to_iio_ring_buffer(d) \ #define to_iio_buffer(d) \
container_of(d, struct iio_ring_buffer, dev) container_of(d, struct iio_buffer, dev)
/** /**
* iio_ring_buffer_register() - register the buffer with IIO core * iio_buffer_register() - register the buffer with IIO core
* @indio_dev: device with the buffer to be registered * @indio_dev: device with the buffer to be registered
**/ **/
int iio_ring_buffer_register(struct iio_dev *indio_dev, int iio_buffer_register(struct iio_dev *indio_dev,
const struct iio_chan_spec *channels, const struct iio_chan_spec *channels,
int num_channels); int num_channels);
/** /**
* iio_ring_buffer_unregister() - unregister the buffer from IIO core * iio_buffer_unregister() - unregister the buffer from IIO core
* @indio_dev: the device with the buffer to be unregistered * @indio_dev: the device with the buffer to be unregistered
**/ **/
void iio_ring_buffer_unregister(struct iio_dev *indio_dev); void iio_buffer_unregister(struct iio_dev *indio_dev);
/** /**
* iio_read_ring_length() - attr func to get number of datums in the buffer * iio_buffer_read_length() - attr func to get number of datums in the buffer
**/ **/
ssize_t iio_read_ring_length(struct device *dev, ssize_t iio_buffer_read_length(struct device *dev,
struct device_attribute *attr, struct device_attribute *attr,
char *buf); char *buf);
/** /**
* iio_write_ring_length() - attr func to set number of datums in the buffer * iio_buffer_write_length() - attr func to set number of datums in the buffer
**/ **/
ssize_t iio_write_ring_length(struct device *dev, ssize_t iio_buffer_write_length(struct device *dev,
struct device_attribute *attr, struct device_attribute *attr,
const char *buf, const char *buf,
size_t len); size_t len);
/** /**
* iio_read_ring_bytes_per_datum() - attr for number of bytes in whole datum * iio_buffer_read_bytes_per_datum() - attr for number of bytes in whole datum
**/ **/
ssize_t iio_read_ring_bytes_per_datum(struct device *dev, ssize_t iio_buffer_read_bytes_per_datum(struct device *dev,
struct device_attribute *attr, struct device_attribute *attr,
char *buf); char *buf);
/** /**
* iio_store_ring_enable() - attr to turn the buffer on * iio_buffer_store_enable() - attr to turn the buffer on
**/ **/
ssize_t iio_store_ring_enable(struct device *dev, ssize_t iio_buffer_store_enable(struct device *dev,
struct device_attribute *attr, struct device_attribute *attr,
const char *buf, const char *buf,
size_t len); size_t len);
/** /**
* iio_show_ring_enable() - attr to see if the buffer is on * iio_buffer_show_enable() - attr to see if the buffer is on
**/ **/
ssize_t iio_show_ring_enable(struct device *dev, ssize_t iio_buffer_show_enable(struct device *dev,
struct device_attribute *attr, struct device_attribute *attr,
char *buf); char *buf);
#define IIO_RING_LENGTH_ATTR DEVICE_ATTR(length, S_IRUGO | S_IWUSR, \ #define IIO_BUFFER_LENGTH_ATTR DEVICE_ATTR(length, S_IRUGO | S_IWUSR, \
iio_read_ring_length, \ iio_buffer_read_length, \
iio_write_ring_length) iio_buffer_write_length)
#define IIO_RING_BYTES_PER_DATUM_ATTR DEVICE_ATTR(bytes_per_datum, S_IRUGO | S_IWUSR, \ #define IIO_BUFFER_BYTES_PER_DATUM_ATTR \
iio_read_ring_bytes_per_datum, NULL) DEVICE_ATTR(bytes_per_datum, S_IRUGO | S_IWUSR, \
#define IIO_RING_ENABLE_ATTR DEVICE_ATTR(enable, S_IRUGO | S_IWUSR, \ iio_buffer_read_bytes_per_datum, NULL)
iio_show_ring_enable, \
iio_store_ring_enable) #define IIO_BUFFER_ENABLE_ATTR DEVICE_ATTR(enable, S_IRUGO | S_IWUSR, \
iio_buffer_show_enable, \
int iio_sw_ring_preenable(struct iio_dev *indio_dev); iio_buffer_store_enable)
int iio_sw_buffer_preenable(struct iio_dev *indio_dev);
#else /* CONFIG_IIO_BUFFER */ #else /* CONFIG_IIO_BUFFER */
static inline int iio_ring_buffer_register(struct iio_dev *indio_dev, static inline int iio_buffer_register(struct iio_dev *indio_dev,
struct iio_chan_spec *channels, struct iio_chan_spec *channels,
int num_channels) int num_channels)
{ {
return 0; return 0;
} }
static inline void iio_ring_buffer_unregister(struct iio_dev *indio_dev) static inline void iio_buffer_unregister(struct iio_dev *indio_dev)
{}; {};
#endif /* CONFIG_IIO_BUFFER */ #endif /* CONFIG_IIO_BUFFER */
......
drivers/staging/iio/gyro/adis16260_core.c
View file @ 14555b14
...@@ -625,20 +625,20 @@ static int __devinit adis16260_probe(struct spi_device *spi) ...@@ -625,20 +625,20 @@ static int __devinit adis16260_probe(struct spi_device *spi)
if (ret) if (ret)
goto error_free_dev; goto error_free_dev;
ret = iio_ring_buffer_register(indio_dev, ret = iio_buffer_register(indio_dev,
indio_dev->channels, indio_dev->channels,
ARRAY_SIZE(adis16260_channels_x)); ARRAY_SIZE(adis16260_channels_x));
if (ret) { if (ret) {
printk(KERN_ERR "failed to initialize the ring\n"); printk(KERN_ERR "failed to initialize the ring\n");
goto error_unreg_ring_funcs; goto error_unreg_ring_funcs;
} }
if (indio_dev->ring) { if (indio_dev->buffer) {
/* Set default scan mode */ /* Set default scan mode */
iio_scan_mask_set(indio_dev->ring, ADIS16260_SCAN_SUPPLY); iio_scan_mask_set(indio_dev->buffer, ADIS16260_SCAN_SUPPLY);
iio_scan_mask_set(indio_dev->ring, ADIS16260_SCAN_GYRO); iio_scan_mask_set(indio_dev->buffer, ADIS16260_SCAN_GYRO);
iio_scan_mask_set(indio_dev->ring, ADIS16260_SCAN_AUX_ADC); iio_scan_mask_set(indio_dev->buffer, ADIS16260_SCAN_AUX_ADC);
iio_scan_mask_set(indio_dev->ring, ADIS16260_SCAN_TEMP); iio_scan_mask_set(indio_dev->buffer, ADIS16260_SCAN_TEMP);
iio_scan_mask_set(indio_dev->ring, ADIS16260_SCAN_ANGL); iio_scan_mask_set(indio_dev->buffer, ADIS16260_SCAN_ANGL);
} }
if (spi->irq) { if (spi->irq) {
ret = adis16260_probe_trigger(indio_dev); ret = adis16260_probe_trigger(indio_dev);
...@@ -659,7 +659,7 @@ static int __devinit adis16260_probe(struct spi_device *spi) ...@@ -659,7 +659,7 @@ static int __devinit adis16260_probe(struct spi_device *spi)
error_remove_trigger: error_remove_trigger:
adis16260_remove_trigger(indio_dev); adis16260_remove_trigger(indio_dev);
error_uninitialize_ring: error_uninitialize_ring:
iio_ring_buffer_unregister(indio_dev); iio_buffer_unregister(indio_dev);
error_unreg_ring_funcs: error_unreg_ring_funcs:
adis16260_unconfigure_ring(indio_dev); adis16260_unconfigure_ring(indio_dev);
error_free_dev: error_free_dev:
...@@ -680,7 +680,7 @@ static int adis16260_remove(struct spi_device *spi) ...@@ -680,7 +680,7 @@ static int adis16260_remove(struct spi_device *spi)
flush_scheduled_work(); flush_scheduled_work();
adis16260_remove_trigger(indio_dev); adis16260_remove_trigger(indio_dev);
iio_ring_buffer_unregister(indio_dev); iio_buffer_unregister(indio_dev);
adis16260_unconfigure_ring(indio_dev); adis16260_unconfigure_ring(indio_dev);
iio_device_unregister(indio_dev); iio_device_unregister(indio_dev);
......
drivers/staging/iio/gyro/adis16260_ring.c
View file @ 14555b14
...@@ -62,7 +62,7 @@ static irqreturn_t adis16260_trigger_handler(int irq, void *p) ...@@ -62,7 +62,7 @@ static irqreturn_t adis16260_trigger_handler(int irq, void *p)
struct iio_poll_func *pf = p; struct iio_poll_func *pf = p;
struct iio_dev *indio_dev = pf->indio_dev; struct iio_dev *indio_dev = pf->indio_dev;
struct adis16260_state *st = iio_priv(indio_dev); struct adis16260_state *st = iio_priv(indio_dev);
struct iio_ring_buffer *ring = indio_dev->ring; struct iio_buffer *ring = indio_dev->buffer;
int i = 0; int i = 0;
s16 *data; s16 *data;
size_t datasize = ring->access->get_bytes_per_datum(ring); size_t datasize = ring->access->get_bytes_per_datum(ring);
...@@ -93,11 +93,11 @@ static irqreturn_t adis16260_trigger_handler(int irq, void *p) ...@@ -93,11 +93,11 @@ static irqreturn_t adis16260_trigger_handler(int irq, void *p)
void adis16260_unconfigure_ring(struct iio_dev *indio_dev) void adis16260_unconfigure_ring(struct iio_dev *indio_dev)
{ {
iio_dealloc_pollfunc(indio_dev->pollfunc); iio_dealloc_pollfunc(indio_dev->pollfunc);
iio_sw_rb_free(indio_dev->ring); iio_sw_rb_free(indio_dev->buffer);
} }
static const struct iio_ring_setup_ops adis16260_ring_setup_ops = { static const struct iio_buffer_setup_ops adis16260_ring_setup_ops = {
.preenable = &iio_sw_ring_preenable, .preenable = &iio_sw_buffer_preenable,
.postenable = &iio_triggered_buffer_postenable, .postenable = &iio_triggered_buffer_postenable,
.predisable = &iio_triggered_buffer_predisable, .predisable = &iio_triggered_buffer_predisable,
}; };
...@@ -105,14 +105,14 @@ static const struct iio_ring_setup_ops adis16260_ring_setup_ops = { ...@@ -105,14 +105,14 @@ static const struct iio_ring_setup_ops adis16260_ring_setup_ops = {
int adis16260_configure_ring(struct iio_dev *indio_dev) int adis16260_configure_ring(struct iio_dev *indio_dev)
{ {
int ret = 0; int ret = 0;
struct iio_ring_buffer *ring; struct iio_buffer *ring;
ring = iio_sw_rb_allocate(indio_dev); ring = iio_sw_rb_allocate(indio_dev);
if (!ring) { if (!ring) {
ret = -ENOMEM; ret = -ENOMEM;
return ret; return ret;
} }
indio_dev->ring = ring; indio_dev->buffer = ring;
/* Effectively select the ring buffer implementation */ /* Effectively select the ring buffer implementation */
ring->access = &ring_sw_access_funcs; ring->access = &ring_sw_access_funcs;
ring->bpe = 2; ring->bpe = 2;
...@@ -135,6 +135,6 @@ int adis16260_configure_ring(struct iio_dev *indio_dev) ...@@ -135,6 +135,6 @@ int adis16260_configure_ring(struct iio_dev *indio_dev)
return 0; return 0;
error_iio_sw_rb_free: error_iio_sw_rb_free:
iio_sw_rb_free(indio_dev->ring); iio_sw_rb_free(indio_dev->buffer);
return ret; return ret;
} }
drivers/staging/iio/iio.h
View file @ 14555b14
...@@ -276,13 +276,13 @@ struct iio_info { ...@@ -276,13 +276,13 @@ struct iio_info {
* @dev: [DRIVER] device structure, should be assigned a parent * @dev: [DRIVER] device structure, should be assigned a parent
* and owner * and owner
* @event_interface: [INTERN] event chrdevs associated with interrupt lines * @event_interface: [INTERN] event chrdevs associated with interrupt lines
* @ring: [DRIVER] any ring buffer present * @buffer: [DRIVER] any buffer present
* @mlock: [INTERN] lock used to prevent simultaneous device state * @mlock: [INTERN] lock used to prevent simultaneous device state
* changes * changes
* @available_scan_masks: [DRIVER] optional array of allowed bitmasks * @available_scan_masks: [DRIVER] optional array of allowed bitmasks
* @masklength: [INTERN] the length of the mask established from * @masklength: [INTERN] the length of the mask established from
* channels * channels
* @trig: [INTERN] current device trigger (ring buffer modes) * @trig: [INTERN] current device trigger (buffer modes)
* @pollfunc: [DRIVER] function run on trigger being received * @pollfunc: [DRIVER] function run on trigger being received
* @channels: [DRIVER] channel specification structure table * @channels: [DRIVER] channel specification structure table
* @num_channels: [DRIVER] number of chanels specified in @channels. * @num_channels: [DRIVER] number of chanels specified in @channels.
...@@ -304,7 +304,7 @@ struct iio_dev { ...@@ -304,7 +304,7 @@ struct iio_dev {
struct iio_event_interface *event_interface; struct iio_event_interface *event_interface;
struct iio_ring_buffer *ring; struct iio_buffer *buffer;
struct mutex mlock; struct mutex mlock;
unsigned long *available_scan_masks; unsigned long *available_scan_masks;
...@@ -383,10 +383,10 @@ static inline struct iio_dev *iio_priv_to_dev(void *priv) ...@@ -383,10 +383,10 @@ static inline struct iio_dev *iio_priv_to_dev(void *priv)
void iio_free_device(struct iio_dev *dev); void iio_free_device(struct iio_dev *dev);
/** /**
* iio_ring_enabled() - helper function to test if any form of ring is enabled * iio_buffer_enabled() - helper function to test if the buffer is enabled
* @dev_info: IIO device info structure for device * @dev_info: IIO device info structure for device
**/ **/
static inline bool iio_ring_enabled(struct iio_dev *dev_info) static inline bool iio_buffer_enabled(struct iio_dev *dev_info)
{ {
return dev_info->currentmode return dev_info->currentmode
& (INDIO_BUFFER_TRIGGERED | INDIO_BUFFER_HARDWARE); & (INDIO_BUFFER_TRIGGERED | INDIO_BUFFER_HARDWARE);
......
drivers/staging/iio/iio_core.h
View file @ 14555b14
...@@ -33,27 +33,27 @@ int __iio_add_chan_devattr(const char *postfix, ...@@ -33,27 +33,27 @@ int __iio_add_chan_devattr(const char *postfix,
#ifdef CONFIG_IIO_BUFFER #ifdef CONFIG_IIO_BUFFER
struct poll_table_struct; struct poll_table_struct;
void iio_chrdev_ring_open(struct iio_dev *indio_dev); void iio_chrdev_buffer_open(struct iio_dev *indio_dev);
void iio_chrdev_ring_release(struct iio_dev *indio_dev); void iio_chrdev_buffer_release(struct iio_dev *indio_dev);
unsigned int iio_ring_poll(struct file *filp, unsigned int iio_buffer_poll(struct file *filp,
struct poll_table_struct *wait); struct poll_table_struct *wait);
ssize_t iio_ring_read_first_n_outer(struct file *filp, char __user *buf, ssize_t iio_buffer_read_first_n_outer(struct file *filp, char __user *buf,
size_t n, loff_t *f_ps); size_t n, loff_t *f_ps);
#define iio_ring_poll_addr (&iio_ring_poll) #define iio_buffer_poll_addr (&iio_buffer_poll)
#define iio_ring_read_first_n_outer_addr (&iio_ring_read_first_n_outer) #define iio_buffer_read_first_n_outer_addr (&iio_buffer_read_first_n_outer)
#else #else
static inline void iio_chrdev_ring_open(struct iio_dev *indio_dev) static inline void iio_chrdev_buffer_open(struct iio_dev *indio_dev)
{} {}
static inline void iio_chrdev_ring_release(struct iio_dev *indio_dev) static inline void iio_chrdev_buffer_release(struct iio_dev *indio_dev)
{} {}
#define iio_ring_poll_addr NULL #define iio_buffer_poll_addr NULL
#define iio_ring_read_first_n_outer_addr NULL #define iio_buffer_read_first_n_outer_addr NULL
#endif #endif
......
drivers/staging/iio/impedance-analyzer/ad5933.c
View file @ 14555b14
...@@ -495,7 +495,7 @@ static int ad5933_read_raw(struct iio_dev *dev_info, ...@@ -495,7 +495,7 @@ static int ad5933_read_raw(struct iio_dev *dev_info,
mutex_lock(&dev_info->mlock); mutex_lock(&dev_info->mlock);
switch (m) { switch (m) {
case 0: case 0:
if (iio_ring_enabled(dev_info)) { if (iio_buffer_enabled(dev_info)) {
ret = -EBUSY; ret = -EBUSY;
goto out; goto out;
} }
...@@ -536,7 +536,7 @@ static const struct iio_info ad5933_info = { ...@@ -536,7 +536,7 @@ static const struct iio_info ad5933_info = {
static int ad5933_ring_preenable(struct iio_dev *indio_dev) static int ad5933_ring_preenable(struct iio_dev *indio_dev)
{ {
struct ad5933_state *st = iio_priv(indio_dev); struct ad5933_state *st = iio_priv(indio_dev);
struct iio_ring_buffer *ring = indio_dev->ring; struct iio_buffer *ring = indio_dev->buffer;
size_t d_size; size_t d_size;
int ret; int ret;
...@@ -546,9 +546,9 @@ static int ad5933_ring_preenable(struct iio_dev *indio_dev) ...@@ -546,9 +546,9 @@ static int ad5933_ring_preenable(struct iio_dev *indio_dev)
d_size = ring->scan_count * d_size = ring->scan_count *
ad5933_channels[1].scan_type.storagebits / 8; ad5933_channels[1].scan_type.storagebits / 8;
if (indio_dev->ring->access->set_bytes_per_datum) if (indio_dev->buffer->access->set_bytes_per_datum)
indio_dev->ring->access->set_bytes_per_datum(indio_dev->ring, indio_dev->buffer->access->
d_size); set_bytes_per_datum(indio_dev->buffer, d_size);
ret = ad5933_reset(st); ret = ad5933_reset(st);
if (ret < 0) if (ret < 0)
...@@ -594,7 +594,7 @@ static int ad5933_ring_postdisable(struct iio_dev *indio_dev) ...@@ -594,7 +594,7 @@ static int ad5933_ring_postdisable(struct iio_dev *indio_dev)
return ad5933_cmd(st, AD5933_CTRL_POWER_DOWN); return ad5933_cmd(st, AD5933_CTRL_POWER_DOWN);
} }
static const struct iio_ring_setup_ops ad5933_ring_setup_ops = { static const struct iio_buffer_setup_ops ad5933_ring_setup_ops = {
.preenable = &ad5933_ring_preenable, .preenable = &ad5933_ring_preenable,
.postenable = &ad5933_ring_postenable, .postenable = &ad5933_ring_postenable,
.postdisable = &ad5933_ring_postdisable, .postdisable = &ad5933_ring_postdisable,
...@@ -602,15 +602,15 @@ static const struct iio_ring_setup_ops ad5933_ring_setup_ops = { ...@@ -602,15 +602,15 @@ static const struct iio_ring_setup_ops ad5933_ring_setup_ops = {
static int ad5933_register_ring_funcs_and_init(struct iio_dev *indio_dev) static int ad5933_register_ring_funcs_and_init(struct iio_dev *indio_dev)
{ {
indio_dev->ring = iio_sw_rb_allocate(indio_dev); indio_dev->buffer = iio_sw_rb_allocate(indio_dev);
if (!indio_dev->ring) if (!indio_dev->buffer)
return -ENOMEM; return -ENOMEM;
/* Effectively select the ring buffer implementation */ /* Effectively select the ring buffer implementation */
indio_dev->ring->access = &ring_sw_access_funcs; indio_dev->buffer->access = &ring_sw_access_funcs;
/* Ring buffer functions - here trigger setup related */ /* Ring buffer functions - here trigger setup related */
indio_dev->ring->setup_ops = &ad5933_ring_setup_ops; indio_dev->buffer->setup_ops = &ad5933_ring_setup_ops;
indio_dev->modes |= INDIO_BUFFER_HARDWARE; indio_dev->modes |= INDIO_BUFFER_HARDWARE;
...@@ -622,7 +622,7 @@ static void ad5933_work(struct work_struct *work) ...@@ -622,7 +622,7 @@ static void ad5933_work(struct work_struct *work)
struct ad5933_state *st = container_of(work, struct ad5933_state *st = container_of(work,
struct ad5933_state, work.work); struct ad5933_state, work.work);
struct iio_dev *indio_dev = i2c_get_clientdata(st->client); struct iio_dev *indio_dev = i2c_get_clientdata(st->client);
struct iio_ring_buffer *ring = indio_dev->ring; struct iio_buffer *ring = indio_dev->buffer;
signed short buf[2]; signed short buf[2];
unsigned char status; unsigned char status;
...@@ -728,13 +728,13 @@ static int __devinit ad5933_probe(struct i2c_client *client, ...@@ -728,13 +728,13 @@ static int __devinit ad5933_probe(struct i2c_client *client,
goto error_disable_reg; goto error_disable_reg;
/* skip temp0_input, register in0_(real|imag)_raw */ /* skip temp0_input, register in0_(real|imag)_raw */
ret = iio_ring_buffer_register(indio_dev, &ad5933_channels[1], 2); ret = iio_buffer_register(indio_dev, &ad5933_channels[1], 2);
if (ret) if (ret)
goto error_unreg_ring; goto error_unreg_ring;
/* enable both REAL and IMAG channels by default */ /* enable both REAL and IMAG channels by default */
iio_scan_mask_set(indio_dev->ring, 0); iio_scan_mask_set(indio_dev->buffer, 0);
iio_scan_mask_set(indio_dev->ring, 1); iio_scan_mask_set(indio_dev->buffer, 1);
ret = ad5933_setup(st); ret = ad5933_setup(st);
if (ret) if (ret)
...@@ -747,9 +747,9 @@ static int __devinit ad5933_probe(struct i2c_client *client, ...@@ -747,9 +747,9 @@ static int __devinit ad5933_probe(struct i2c_client *client,
return 0; return 0;
error_uninitialize_ring: error_uninitialize_ring:
iio_ring_buffer_unregister(indio_dev); iio_buffer_unregister(indio_dev);
error_unreg_ring: error_unreg_ring:
iio_sw_rb_free(indio_dev->ring); iio_sw_rb_free(indio_dev->buffer);
error_disable_reg: error_disable_reg:
if (!IS_ERR(st->reg)) if (!IS_ERR(st->reg))
regulator_disable(st->reg); regulator_disable(st->reg);
...@@ -767,8 +767,8 @@ static __devexit int ad5933_remove(struct i2c_client *client) ...@@ -767,8 +767,8 @@ static __devexit int ad5933_remove(struct i2c_client *client)
struct iio_dev *indio_dev = i2c_get_clientdata(client); struct iio_dev *indio_dev = i2c_get_clientdata(client);
struct ad5933_state *st = iio_priv(indio_dev); struct ad5933_state *st = iio_priv(indio_dev);
iio_ring_buffer_unregister(indio_dev); iio_buffer_unregister(indio_dev);
iio_sw_rb_free(indio_dev->ring); iio_sw_rb_free(indio_dev->buffer);
if (!IS_ERR(st->reg)) { if (!IS_ERR(st->reg)) {
regulator_disable(st->reg); regulator_disable(st->reg);
regulator_put(st->reg); regulator_put(st->reg);
......
drivers/staging/iio/imu/adis16400_core.c
View file @ 14555b14
...@@ -1045,9 +1045,9 @@ static int __devinit adis16400_probe(struct spi_device *spi) ...@@ -1045,9 +1045,9 @@ static int __devinit adis16400_probe(struct spi_device *spi)
if (ret) if (ret)
goto error_free_dev; goto error_free_dev;
ret = iio_ring_buffer_register(indio_dev, ret = iio_buffer_register(indio_dev,
st->variant->channels, st->variant->channels,
st->variant->num_channels); st->variant->num_channels);
if (ret) { if (ret) {
dev_err(&spi->dev, "failed to initialize the ring\n"); dev_err(&spi->dev, "failed to initialize the ring\n");
goto error_unreg_ring_funcs; goto error_unreg_ring_funcs;
...@@ -1073,7 +1073,7 @@ static int __devinit adis16400_probe(struct spi_device *spi) ...@@ -1073,7 +1073,7 @@ static int __devinit adis16400_probe(struct spi_device *spi)
if (indio_dev->modes & INDIO_BUFFER_TRIGGERED) if (indio_dev->modes & INDIO_BUFFER_TRIGGERED)
adis16400_remove_trigger(indio_dev); adis16400_remove_trigger(indio_dev);
error_uninitialize_ring: error_uninitialize_ring:
iio_ring_buffer_unregister(indio_dev); iio_buffer_unregister(indio_dev);
error_unreg_ring_funcs: error_unreg_ring_funcs:
adis16400_unconfigure_ring(indio_dev); adis16400_unconfigure_ring(indio_dev);
error_free_dev: error_free_dev:
...@@ -1093,7 +1093,7 @@ static int adis16400_remove(struct spi_device *spi) ...@@ -1093,7 +1093,7 @@ static int adis16400_remove(struct spi_device *spi)
goto err_ret; goto err_ret;
adis16400_remove_trigger(indio_dev); adis16400_remove_trigger(indio_dev);
iio_ring_buffer_unregister(indio_dev); iio_buffer_unregister(indio_dev);
adis16400_unconfigure_ring(indio_dev); adis16400_unconfigure_ring(indio_dev);
iio_device_unregister(indio_dev); iio_device_unregister(indio_dev);
......
drivers/staging/iio/imu/adis16400_ring.c
View file @ 14555b14
...@@ -79,13 +79,13 @@ static int adis16350_spi_read_all(struct device *dev, u8 *rx) ...@@ -79,13 +79,13 @@ static int adis16350_spi_read_all(struct device *dev, u8 *rx)
int i, j = 0, ret; int i, j = 0, ret;
struct spi_transfer *xfers; struct spi_transfer *xfers;
xfers = kzalloc(sizeof(*xfers)*indio_dev->ring->scan_count + 1, xfers = kzalloc(sizeof(*xfers)*indio_dev->buffer->scan_count + 1,
GFP_KERNEL); GFP_KERNEL);
if (xfers == NULL) if (xfers == NULL)
return -ENOMEM; return -ENOMEM;
for (i = 0; i < ARRAY_SIZE(read_all_tx_array); i++) for (i = 0; i < ARRAY_SIZE(read_all_tx_array); i++)
if (test_bit(i, indio_dev->ring->scan_mask)) { if (test_bit(i, indio_dev->buffer->scan_mask)) {
xfers[j].tx_buf = &read_all_tx_array[i]; xfers[j].tx_buf = &read_all_tx_array[i];
xfers[j].bits_per_word = 16; xfers[j].bits_per_word = 16;
xfers[j].len = 2; xfers[j].len = 2;
...@@ -96,7 +96,7 @@ static int adis16350_spi_read_all(struct device *dev, u8 *rx) ...@@ -96,7 +96,7 @@ static int adis16350_spi_read_all(struct device *dev, u8 *rx)
xfers[j].len = 2; xfers[j].len = 2;
spi_message_init(&msg); spi_message_init(&msg);
for (j = 0; j < indio_dev->ring->scan_count + 1; j++) for (j = 0; j < indio_dev->buffer->scan_count + 1; j++)
spi_message_add_tail(&xfers[j], &msg); spi_message_add_tail(&xfers[j], &msg);
ret = spi_sync(st->us, &msg); ret = spi_sync(st->us, &msg);
...@@ -113,7 +113,7 @@ static irqreturn_t adis16400_trigger_handler(int irq, void *p) ...@@ -113,7 +113,7 @@ static irqreturn_t adis16400_trigger_handler(int irq, void *p)
struct iio_poll_func *pf = p; struct iio_poll_func *pf = p;
struct iio_dev *indio_dev = pf->indio_dev; struct iio_dev *indio_dev = pf->indio_dev;
struct adis16400_state *st = iio_priv(indio_dev); struct adis16400_state *st = iio_priv(indio_dev);
struct iio_ring_buffer *ring = indio_dev->ring; struct iio_buffer *ring = indio_dev->buffer;
int i = 0, j, ret = 0; int i = 0, j, ret = 0;
s16 *data; s16 *data;
size_t datasize = ring->access->get_bytes_per_datum(ring); size_t datasize = ring->access->get_bytes_per_datum(ring);
...@@ -137,7 +137,7 @@ static irqreturn_t adis16400_trigger_handler(int irq, void *p) ...@@ -137,7 +137,7 @@ static irqreturn_t adis16400_trigger_handler(int irq, void *p)
ret = adis16400_spi_read_burst(&indio_dev->dev, st->rx); ret = adis16400_spi_read_burst(&indio_dev->dev, st->rx);
if (ret < 0) if (ret < 0)
goto err; goto err;
for (; i < indio_dev->ring->scan_count; i++) { for (; i < indio_dev->buffer->scan_count; i++) {
j = __ffs(mask); j = __ffs(mask);
mask &= ~(1 << j); mask &= ~(1 << j);
data[i] = be16_to_cpup( data[i] = be16_to_cpup(
...@@ -148,7 +148,7 @@ static irqreturn_t adis16400_trigger_handler(int irq, void *p) ...@@ -148,7 +148,7 @@ static irqreturn_t adis16400_trigger_handler(int irq, void *p)
/* Guaranteed to be aligned with 8 byte boundary */ /* Guaranteed to be aligned with 8 byte boundary */
if (ring->scan_timestamp) if (ring->scan_timestamp)
*((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp; *((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp;
ring->access->store_to(indio_dev->ring, (u8 *) data, pf->timestamp); ring->access->store_to(indio_dev->buffer, (u8 *) data, pf->timestamp);
iio_trigger_notify_done(indio_dev->trig); iio_trigger_notify_done(indio_dev->trig);
...@@ -163,11 +163,11 @@ static irqreturn_t adis16400_trigger_handler(int irq, void *p) ...@@ -163,11 +163,11 @@ static irqreturn_t adis16400_trigger_handler(int irq, void *p)
void adis16400_unconfigure_ring(struct iio_dev *indio_dev) void adis16400_unconfigure_ring(struct iio_dev *indio_dev)
{ {
iio_dealloc_pollfunc(indio_dev->pollfunc); iio_dealloc_pollfunc(indio_dev->pollfunc);
iio_sw_rb_free(indio_dev->ring); iio_sw_rb_free(indio_dev->buffer);
} }
static const struct iio_ring_setup_ops adis16400_ring_setup_ops = { static const struct iio_buffer_setup_ops adis16400_ring_setup_ops = {
.preenable = &iio_sw_ring_preenable, .preenable = &iio_sw_buffer_preenable,
.postenable = &iio_triggered_buffer_postenable, .postenable = &iio_triggered_buffer_postenable,
.predisable = &iio_triggered_buffer_predisable, .predisable = &iio_triggered_buffer_predisable,
}; };
...@@ -175,15 +175,14 @@ static const struct iio_ring_setup_ops adis16400_ring_setup_ops = { ...@@ -175,15 +175,14 @@ static const struct iio_ring_setup_ops adis16400_ring_setup_ops = {
int adis16400_configure_ring(struct iio_dev *indio_dev) int adis16400_configure_ring(struct iio_dev *indio_dev)
{ {
int ret = 0; int ret = 0;
struct adis16400_state *st = iio_priv(indio_dev); struct iio_buffer *ring;
struct iio_ring_buffer *ring;
ring = iio_sw_rb_allocate(indio_dev); ring = iio_sw_rb_allocate(indio_dev);
if (!ring) { if (!ring) {
ret = -ENOMEM; ret = -ENOMEM;
return ret; return ret;
} }
indio_dev->ring = ring; indio_dev->buffer = ring;
/* Effectively select the ring buffer implementation */ /* Effectively select the ring buffer implementation */
ring->access = &ring_sw_access_funcs; ring->access = &ring_sw_access_funcs;
ring->bpe = 2; ring->bpe = 2;
...@@ -206,6 +205,6 @@ int adis16400_configure_ring(struct iio_dev *indio_dev) ...@@ -206,6 +205,6 @@ int adis16400_configure_ring(struct iio_dev *indio_dev)
indio_dev->modes |= INDIO_BUFFER_TRIGGERED; indio_dev->modes |= INDIO_BUFFER_TRIGGERED;
return 0; return 0;
error_iio_sw_rb_free: error_iio_sw_rb_free:
iio_sw_rb_free(indio_dev->ring); iio_sw_rb_free(indio_dev->buffer);
return ret; return ret;
} }
drivers/staging/iio/industrialio-ring.c → drivers/staging/iio/industrialio-buffer.c
View file @ 14555b14
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* under the terms of the GNU General Public License version 2 as published by * under the terms of the GNU General Public License version 2 as published by
* the Free Software Foundation. * the Free Software Foundation.
* *
* Handling of ring allocation / resizing. * Handling of buffer allocation / resizing.
* *
* *
* Things to look at here. * Things to look at here.
...@@ -31,16 +31,16 @@ static const char * const iio_endian_prefix[] = { ...@@ -31,16 +31,16 @@ static const char * const iio_endian_prefix[] = {
}; };
/** /**
* iio_ring_read_first_n_outer() - chrdev read for ring buffer access * iio_buffer_read_first_n_outer() - chrdev read for buffer access
* *
* This function relies on all ring buffer implementations having an * This function relies on all buffer implementations having an
* iio_ring _bufer as their first element. * iio_buffer as their first element.
**/ **/
ssize_t iio_ring_read_first_n_outer(struct file *filp, char __user *buf, ssize_t iio_buffer_read_first_n_outer(struct file *filp, char __user *buf,
size_t n, loff_t *f_ps) size_t n, loff_t *f_ps)
{ {
struct iio_dev *indio_dev = filp->private_data; struct iio_dev *indio_dev = filp->private_data;
struct iio_ring_buffer *rb = indio_dev->ring; struct iio_buffer *rb = indio_dev->buffer;
if (!rb->access->read_first_n) if (!rb->access->read_first_n)
return -EINVAL; return -EINVAL;
...@@ -48,13 +48,13 @@ ssize_t iio_ring_read_first_n_outer(struct file *filp, char __user *buf, ...@@ -48,13 +48,13 @@ ssize_t iio_ring_read_first_n_outer(struct file *filp, char __user *buf,
} }
/** /**
* iio_ring_poll() - poll the ring to find out if it has data * iio_buffer_poll() - poll the buffer to find out if it has data
*/ */
unsigned int iio_ring_poll(struct file *filp, unsigned int iio_buffer_poll(struct file *filp,
struct poll_table_struct *wait) struct poll_table_struct *wait)
{ {
struct iio_dev *indio_dev = filp->private_data; struct iio_dev *indio_dev = filp->private_data;
struct iio_ring_buffer *rb = indio_dev->ring; struct iio_buffer *rb = indio_dev->buffer;
poll_wait(filp, &rb->pollq, wait); poll_wait(filp, &rb->pollq, wait);
if (rb->stufftoread) if (rb->stufftoread)
...@@ -63,16 +63,16 @@ unsigned int iio_ring_poll(struct file *filp, ...@@ -63,16 +63,16 @@ unsigned int iio_ring_poll(struct file *filp,
return 0; return 0;
} }
void iio_chrdev_ring_open(struct iio_dev *indio_dev) void iio_chrdev_buffer_open(struct iio_dev *indio_dev)
{ {
struct iio_ring_buffer *rb = indio_dev->ring; struct iio_buffer *rb = indio_dev->buffer;
if (rb && rb->access->mark_in_use) if (rb && rb->access->mark_in_use)
rb->access->mark_in_use(rb); rb->access->mark_in_use(rb);
} }
void iio_chrdev_ring_release(struct iio_dev *indio_dev) void iio_chrdev_buffer_release(struct iio_dev *indio_dev)
{ {
struct iio_ring_buffer *rb = indio_dev->ring; struct iio_buffer *rb = indio_dev->buffer;
clear_bit(IIO_BUSY_BIT_POS, &rb->flags); clear_bit(IIO_BUSY_BIT_POS, &rb->flags);
if (rb->access->unmark_in_use) if (rb->access->unmark_in_use)
...@@ -80,13 +80,12 @@ void iio_chrdev_ring_release(struct iio_dev *indio_dev) ...@@ -80,13 +80,12 @@ void iio_chrdev_ring_release(struct iio_dev *indio_dev)
} }
void iio_ring_buffer_init(struct iio_ring_buffer *ring, void iio_buffer_init(struct iio_buffer *buffer, struct iio_dev *dev_info)
struct iio_dev *dev_info)
{ {
ring->indio_dev = dev_info; buffer->indio_dev = dev_info;
init_waitqueue_head(&ring->pollq); init_waitqueue_head(&buffer->pollq);
} }
EXPORT_SYMBOL(iio_ring_buffer_init); EXPORT_SYMBOL(iio_buffer_init);
static ssize_t iio_show_scan_index(struct device *dev, static ssize_t iio_show_scan_index(struct device *dev,
struct device_attribute *attr, struct device_attribute *attr,
...@@ -123,17 +122,17 @@ static ssize_t iio_scan_el_show(struct device *dev, ...@@ -123,17 +122,17 @@ static ssize_t iio_scan_el_show(struct device *dev,
int ret; int ret;
struct iio_dev *dev_info = dev_get_drvdata(dev); struct iio_dev *dev_info = dev_get_drvdata(dev);
ret = iio_scan_mask_query(dev_info->ring, ret = iio_scan_mask_query(dev_info->buffer,
to_iio_dev_attr(attr)->address); to_iio_dev_attr(attr)->address);
if (ret < 0) if (ret < 0)
return ret; return ret;
return sprintf(buf, "%d\n", ret); return sprintf(buf, "%d\n", ret);
} }
static int iio_scan_mask_clear(struct iio_ring_buffer *ring, int bit) static int iio_scan_mask_clear(struct iio_buffer *buffer, int bit)
{ {
clear_bit(bit, ring->scan_mask); clear_bit(bit, buffer->scan_mask);
ring->scan_count--; buffer->scan_count--;
return 0; return 0;
} }
...@@ -145,7 +144,7 @@ static ssize_t iio_scan_el_store(struct device *dev, ...@@ -145,7 +144,7 @@ static ssize_t iio_scan_el_store(struct device *dev,
int ret = 0; int ret = 0;
bool state; bool state;
struct iio_dev *indio_dev = dev_get_drvdata(dev); struct iio_dev *indio_dev = dev_get_drvdata(dev);
struct iio_ring_buffer *ring = indio_dev->ring; struct iio_buffer *buffer = indio_dev->buffer;
struct iio_dev_attr *this_attr = to_iio_dev_attr(attr); struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
state = !(buf[0] == '0'); state = !(buf[0] == '0');
...@@ -154,15 +153,15 @@ static ssize_t iio_scan_el_store(struct device *dev, ...@@ -154,15 +153,15 @@ static ssize_t iio_scan_el_store(struct device *dev,
ret = -EBUSY; ret = -EBUSY;
goto error_ret; goto error_ret;
} }
ret = iio_scan_mask_query(ring, this_attr->address); ret = iio_scan_mask_query(buffer, this_attr->address);
if (ret < 0) if (ret < 0)
goto error_ret; goto error_ret;
if (!state && ret) { if (!state && ret) {
ret = iio_scan_mask_clear(ring, this_attr->address); ret = iio_scan_mask_clear(buffer, this_attr->address);
if (ret) if (ret)
goto error_ret; goto error_ret;
} else if (state && !ret) { } else if (state && !ret) {
ret = iio_scan_mask_set(ring, this_attr->address); ret = iio_scan_mask_set(buffer, this_attr->address);
if (ret) if (ret)
goto error_ret; goto error_ret;
} }
...@@ -179,7 +178,7 @@ static ssize_t iio_scan_el_ts_show(struct device *dev, ...@@ -179,7 +178,7 @@ static ssize_t iio_scan_el_ts_show(struct device *dev,
char *buf) char *buf)
{ {
struct iio_dev *dev_info = dev_get_drvdata(dev); struct iio_dev *dev_info = dev_get_drvdata(dev);
return sprintf(buf, "%d\n", dev_info->ring->scan_timestamp); return sprintf(buf, "%d\n", dev_info->buffer->scan_timestamp);
} }
static ssize_t iio_scan_el_ts_store(struct device *dev, static ssize_t iio_scan_el_ts_store(struct device *dev,
...@@ -197,18 +196,18 @@ static ssize_t iio_scan_el_ts_store(struct device *dev, ...@@ -197,18 +196,18 @@ static ssize_t iio_scan_el_ts_store(struct device *dev,
ret = -EBUSY; ret = -EBUSY;
goto error_ret; goto error_ret;
} }
indio_dev->ring->scan_timestamp = state; indio_dev->buffer->scan_timestamp = state;
error_ret: error_ret:
mutex_unlock(&indio_dev->mlock); mutex_unlock(&indio_dev->mlock);
return ret ? ret : len; return ret ? ret : len;
} }
static int iio_ring_add_channel_sysfs(struct iio_dev *indio_dev, static int iio_buffer_add_channel_sysfs(struct iio_dev *indio_dev,
const struct iio_chan_spec *chan) const struct iio_chan_spec *chan)
{ {
int ret, attrcount = 0; int ret, attrcount = 0;
struct iio_ring_buffer *ring = indio_dev->ring; struct iio_buffer *buffer = indio_dev->buffer;
ret = __iio_add_chan_devattr("index", ret = __iio_add_chan_devattr("index",
chan, chan,
...@@ -217,7 +216,7 @@ static int iio_ring_add_channel_sysfs(struct iio_dev *indio_dev, ...@@ -217,7 +216,7 @@ static int iio_ring_add_channel_sysfs(struct iio_dev *indio_dev,
0, 0,
0, 0,
&indio_dev->dev, &indio_dev->dev,
&ring->scan_el_dev_attr_list); &buffer->scan_el_dev_attr_list);
if (ret) if (ret)
goto error_ret; goto error_ret;
attrcount++; attrcount++;
...@@ -228,7 +227,7 @@ static int iio_ring_add_channel_sysfs(struct iio_dev *indio_dev, ...@@ -228,7 +227,7 @@ static int iio_ring_add_channel_sysfs(struct iio_dev *indio_dev,
0, 0,
0, 0,
&indio_dev->dev, &indio_dev->dev,
&ring->scan_el_dev_attr_list); &buffer->scan_el_dev_attr_list);
if (ret) if (ret)
goto error_ret; goto error_ret;
attrcount++; attrcount++;
...@@ -240,7 +239,7 @@ static int iio_ring_add_channel_sysfs(struct iio_dev *indio_dev, ...@@ -240,7 +239,7 @@ static int iio_ring_add_channel_sysfs(struct iio_dev *indio_dev,
chan->scan_index, chan->scan_index,
0, 0,
&indio_dev->dev, &indio_dev->dev,
&ring->scan_el_dev_attr_list); &buffer->scan_el_dev_attr_list);
else else
ret = __iio_add_chan_devattr("en", ret = __iio_add_chan_devattr("en",
chan, chan,
...@@ -249,51 +248,51 @@ static int iio_ring_add_channel_sysfs(struct iio_dev *indio_dev, ...@@ -249,51 +248,51 @@ static int iio_ring_add_channel_sysfs(struct iio_dev *indio_dev,
chan->scan_index, chan->scan_index,
0, 0,
&indio_dev->dev, &indio_dev->dev,
&ring->scan_el_dev_attr_list); &buffer->scan_el_dev_attr_list);
attrcount++; attrcount++;
ret = attrcount; ret = attrcount;
error_ret: error_ret:
return ret; return ret;
} }
static void iio_ring_remove_and_free_scan_dev_attr(struct iio_dev *indio_dev, static void iio_buffer_remove_and_free_scan_dev_attr(struct iio_dev *indio_dev,
struct iio_dev_attr *p) struct iio_dev_attr *p)
{ {
kfree(p->dev_attr.attr.name); kfree(p->dev_attr.attr.name);
kfree(p); kfree(p);
} }
static void __iio_ring_attr_cleanup(struct iio_dev *indio_dev) static void __iio_buffer_attr_cleanup(struct iio_dev *indio_dev)
{ {
struct iio_dev_attr *p, *n; struct iio_dev_attr *p, *n;
struct iio_ring_buffer *ring = indio_dev->ring; struct iio_buffer *buffer = indio_dev->buffer;
list_for_each_entry_safe(p, n, list_for_each_entry_safe(p, n,
&ring->scan_el_dev_attr_list, l) &buffer->scan_el_dev_attr_list, l)
iio_ring_remove_and_free_scan_dev_attr(indio_dev, p); iio_buffer_remove_and_free_scan_dev_attr(indio_dev, p);
} }
static const char * const iio_scan_elements_group_name = "scan_elements"; static const char * const iio_scan_elements_group_name = "scan_elements";
int iio_ring_buffer_register(struct iio_dev *indio_dev, int iio_buffer_register(struct iio_dev *indio_dev,
const struct iio_chan_spec *channels, const struct iio_chan_spec *channels,
int num_channels) int num_channels)
{ {
struct iio_dev_attr *p; struct iio_dev_attr *p;
struct attribute **attr; struct attribute **attr;
struct iio_ring_buffer *ring = indio_dev->ring; struct iio_buffer *buffer = indio_dev->buffer;
int ret, i, attrn, attrcount, attrcount_orig = 0; int ret, i, attrn, attrcount, attrcount_orig = 0;
if (ring->attrs) if (buffer->attrs)
indio_dev->groups[indio_dev->groupcounter++] = ring->attrs; indio_dev->groups[indio_dev->groupcounter++] = buffer->attrs;
if (ring->scan_el_attrs != NULL) { if (buffer->scan_el_attrs != NULL) {
attr = ring->scan_el_attrs->attrs; attr = buffer->scan_el_attrs->attrs;
while (*attr++ != NULL) while (*attr++ != NULL)
attrcount_orig++; attrcount_orig++;
} }
attrcount = attrcount_orig; attrcount = attrcount_orig;
INIT_LIST_HEAD(&ring->scan_el_dev_attr_list); INIT_LIST_HEAD(&buffer->scan_el_dev_attr_list);
if (channels) { if (channels) {
/* new magic */ /* new magic */
for (i = 0; i < num_channels; i++) { for (i = 0; i < num_channels; i++) {
...@@ -303,167 +302,168 @@ int iio_ring_buffer_register(struct iio_dev *indio_dev, ...@@ -303,167 +302,168 @@ int iio_ring_buffer_register(struct iio_dev *indio_dev,
indio_dev->masklength indio_dev->masklength
= indio_dev->channels[i].scan_index + 1; = indio_dev->channels[i].scan_index + 1;
ret = iio_ring_add_channel_sysfs(indio_dev, ret = iio_buffer_add_channel_sysfs(indio_dev,
&channels[i]); &channels[i]);
if (ret < 0) if (ret < 0)
goto error_cleanup_dynamic; goto error_cleanup_dynamic;
attrcount += ret; attrcount += ret;
} }
if (indio_dev->masklength && ring->scan_mask == NULL) { if (indio_dev->masklength && buffer->scan_mask == NULL) {
ring->scan_mask buffer->scan_mask
= kzalloc(sizeof(*ring->scan_mask)* = kzalloc(sizeof(*buffer->scan_mask)*
BITS_TO_LONGS(indio_dev->masklength), BITS_TO_LONGS(indio_dev->masklength),
GFP_KERNEL); GFP_KERNEL);
if (ring->scan_mask == NULL) { if (buffer->scan_mask == NULL) {
ret = -ENOMEM; ret = -ENOMEM;
goto error_cleanup_dynamic; goto error_cleanup_dynamic;
} }
} }
} }
ring->scan_el_group.name = iio_scan_elements_group_name; buffer->scan_el_group.name = iio_scan_elements_group_name;
ring->scan_el_group.attrs buffer->scan_el_group.attrs
= kzalloc(sizeof(ring->scan_el_group.attrs[0])*(attrcount + 1), = kzalloc(sizeof(buffer->scan_el_group.attrs[0])*
(attrcount + 1),
GFP_KERNEL); GFP_KERNEL);
if (ring->scan_el_group.attrs == NULL) { if (buffer->scan_el_group.attrs == NULL) {
ret = -ENOMEM; ret = -ENOMEM;
goto error_free_scan_mask; goto error_free_scan_mask;
} }
if (ring->scan_el_attrs) if (buffer->scan_el_attrs)
memcpy(ring->scan_el_group.attrs, ring->scan_el_attrs, memcpy(buffer->scan_el_group.attrs, buffer->scan_el_attrs,
sizeof(ring->scan_el_group.attrs[0])*attrcount_orig); sizeof(buffer->scan_el_group.attrs[0])*attrcount_orig);
attrn = attrcount_orig; attrn = attrcount_orig;
list_for_each_entry(p, &ring->scan_el_dev_attr_list, l) list_for_each_entry(p, &buffer->scan_el_dev_attr_list, l)
ring->scan_el_group.attrs[attrn++] = &p->dev_attr.attr; buffer->scan_el_group.attrs[attrn++] = &p->dev_attr.attr;
indio_dev->groups[indio_dev->groupcounter++] = &ring->scan_el_group; indio_dev->groups[indio_dev->groupcounter++] = &buffer->scan_el_group;
return 0; return 0;
error_free_scan_mask: error_free_scan_mask:
kfree(ring->scan_mask); kfree(buffer->scan_mask);
error_cleanup_dynamic: error_cleanup_dynamic:
__iio_ring_attr_cleanup(indio_dev); __iio_buffer_attr_cleanup(indio_dev);
return ret; return ret;
} }
EXPORT_SYMBOL(iio_ring_buffer_register); EXPORT_SYMBOL(iio_buffer_register);
void iio_ring_buffer_unregister(struct iio_dev *indio_dev) void iio_buffer_unregister(struct iio_dev *indio_dev)
{ {
kfree(indio_dev->ring->scan_mask); kfree(indio_dev->buffer->scan_mask);
kfree(indio_dev->ring->scan_el_group.attrs); kfree(indio_dev->buffer->scan_el_group.attrs);
__iio_ring_attr_cleanup(indio_dev); __iio_buffer_attr_cleanup(indio_dev);
} }
EXPORT_SYMBOL(iio_ring_buffer_unregister); EXPORT_SYMBOL(iio_buffer_unregister);
ssize_t iio_read_ring_length(struct device *dev, ssize_t iio_buffer_read_length(struct device *dev,
struct device_attribute *attr, struct device_attribute *attr,
char *buf) char *buf)
{ {
struct iio_dev *indio_dev = dev_get_drvdata(dev); struct iio_dev *indio_dev = dev_get_drvdata(dev);
struct iio_ring_buffer *ring = indio_dev->ring; struct iio_buffer *buffer = indio_dev->buffer;
if (ring->access->get_length) if (buffer->access->get_length)
return sprintf(buf, "%d\n", return sprintf(buf, "%d\n",
ring->access->get_length(ring)); buffer->access->get_length(buffer));
return 0; return 0;
} }
EXPORT_SYMBOL(iio_read_ring_length); EXPORT_SYMBOL(iio_buffer_read_length);
ssize_t iio_write_ring_length(struct device *dev, ssize_t iio_buffer_write_length(struct device *dev,
struct device_attribute *attr, struct device_attribute *attr,
const char *buf, const char *buf,
size_t len) size_t len)
{ {
int ret; int ret;
ulong val; ulong val;
struct iio_dev *indio_dev = dev_get_drvdata(dev); struct iio_dev *indio_dev = dev_get_drvdata(dev);
struct iio_ring_buffer *ring = indio_dev->ring; struct iio_buffer *buffer = indio_dev->buffer;
ret = strict_strtoul(buf, 10, &val); ret = strict_strtoul(buf, 10, &val);
if (ret) if (ret)
return ret; return ret;
if (ring->access->get_length) if (buffer->access->get_length)
if (val == ring->access->get_length(ring)) if (val == buffer->access->get_length(buffer))
return len; return len;
if (ring->access->set_length) { if (buffer->access->set_length) {
ring->access->set_length(ring, val); buffer->access->set_length(buffer, val);
if (ring->access->mark_param_change) if (buffer->access->mark_param_change)
ring->access->mark_param_change(ring); buffer->access->mark_param_change(buffer);
} }
return len; return len;
} }
EXPORT_SYMBOL(iio_write_ring_length); EXPORT_SYMBOL(iio_buffer_write_length);
ssize_t iio_read_ring_bytes_per_datum(struct device *dev, ssize_t iio_buffer_read_bytes_per_datum(struct device *dev,
struct device_attribute *attr, struct device_attribute *attr,
char *buf) char *buf)
{ {
struct iio_dev *indio_dev = dev_get_drvdata(dev); struct iio_dev *indio_dev = dev_get_drvdata(dev);
struct iio_ring_buffer *ring = indio_dev->ring; struct iio_buffer *buffer = indio_dev->buffer;
if (ring->access->get_bytes_per_datum) if (buffer->access->get_bytes_per_datum)
return sprintf(buf, "%d\n", return sprintf(buf, "%d\n",
ring->access->get_bytes_per_datum(ring)); buffer->access->get_bytes_per_datum(buffer));
return 0; return 0;
} }
EXPORT_SYMBOL(iio_read_ring_bytes_per_datum); EXPORT_SYMBOL(iio_buffer_read_bytes_per_datum);
ssize_t iio_store_ring_enable(struct device *dev, ssize_t iio_buffer_store_enable(struct device *dev,
struct device_attribute *attr, struct device_attribute *attr,
const char *buf, const char *buf,
size_t len) size_t len)
{ {
int ret; int ret;
bool requested_state, current_state; bool requested_state, current_state;
int previous_mode; int previous_mode;
struct iio_dev *dev_info = dev_get_drvdata(dev); struct iio_dev *dev_info = dev_get_drvdata(dev);
struct iio_ring_buffer *ring = dev_info->ring; struct iio_buffer *buffer = dev_info->buffer;
mutex_lock(&dev_info->mlock); mutex_lock(&dev_info->mlock);
previous_mode = dev_info->currentmode; previous_mode = dev_info->currentmode;
requested_state = !(buf[0] == '0'); requested_state = !(buf[0] == '0');
current_state = !!(previous_mode & INDIO_ALL_BUFFER_MODES); current_state = !!(previous_mode & INDIO_ALL_BUFFER_MODES);
if (current_state == requested_state) { if (current_state == requested_state) {
printk(KERN_INFO "iio-ring, current state requested again\n"); printk(KERN_INFO "iio-buffer, current state requested again\n");
goto done; goto done;
} }
if (requested_state) { if (requested_state) {
if (ring->setup_ops->preenable) { if (buffer->setup_ops->preenable) {
ret = ring->setup_ops->preenable(dev_info); ret = buffer->setup_ops->preenable(dev_info);
if (ret) { if (ret) {
printk(KERN_ERR printk(KERN_ERR
"Buffer not started:" "Buffer not started:"
"ring preenable failed\n"); "buffer preenable failed\n");
goto error_ret; goto error_ret;
} }
} }
if (ring->access->request_update) { if (buffer->access->request_update) {
ret = ring->access->request_update(ring); ret = buffer->access->request_update(buffer);
if (ret) { if (ret) {
printk(KERN_INFO printk(KERN_INFO
"Buffer not started:" "Buffer not started:"
"ring parameter update failed\n"); "buffer parameter update failed\n");
goto error_ret; goto error_ret;
} }
} }
if (ring->access->mark_in_use) if (buffer->access->mark_in_use)
ring->access->mark_in_use(ring); buffer->access->mark_in_use(buffer);
/* Definitely possible for devices to support both of these.*/ /* Definitely possible for devices to support both of these.*/
if (dev_info->modes & INDIO_BUFFER_TRIGGERED) { if (dev_info->modes & INDIO_BUFFER_TRIGGERED) {
if (!dev_info->trig) { if (!dev_info->trig) {
printk(KERN_INFO printk(KERN_INFO
"Buffer not started: no trigger\n"); "Buffer not started: no trigger\n");
ret = -EINVAL; ret = -EINVAL;
if (ring->access->unmark_in_use) if (buffer->access->unmark_in_use)
ring->access->unmark_in_use(ring); buffer->access->unmark_in_use(buffer);
goto error_ret; goto error_ret;
} }
dev_info->currentmode = INDIO_BUFFER_TRIGGERED; dev_info->currentmode = INDIO_BUFFER_TRIGGERED;
...@@ -474,31 +474,32 @@ ssize_t iio_store_ring_enable(struct device *dev, ...@@ -474,31 +474,32 @@ ssize_t iio_store_ring_enable(struct device *dev,
goto error_ret; goto error_ret;
} }
if (ring->setup_ops->postenable) { if (buffer->setup_ops->postenable) {
ret = ring->setup_ops->postenable(dev_info); ret = buffer->setup_ops->postenable(dev_info);
if (ret) { if (ret) {
printk(KERN_INFO printk(KERN_INFO
"Buffer not started:" "Buffer not started:"
"postenable failed\n"); "postenable failed\n");
if (ring->access->unmark_in_use) if (buffer->access->unmark_in_use)
ring->access->unmark_in_use(ring); buffer->access->unmark_in_use(buffer);
dev_info->currentmode = previous_mode; dev_info->currentmode = previous_mode;
if (ring->setup_ops->postdisable) if (buffer->setup_ops->postdisable)
ring->setup_ops->postdisable(dev_info); buffer->setup_ops->
postdisable(dev_info);
goto error_ret; goto error_ret;
} }
} }
} else { } else {
if (ring->setup_ops->predisable) { if (buffer->setup_ops->predisable) {
ret = ring->setup_ops->predisable(dev_info); ret = buffer->setup_ops->predisable(dev_info);
if (ret) if (ret)
goto error_ret; goto error_ret;
} }
if (ring->access->unmark_in_use) if (buffer->access->unmark_in_use)
ring->access->unmark_in_use(ring); buffer->access->unmark_in_use(buffer);
dev_info->currentmode = INDIO_DIRECT_MODE; dev_info->currentmode = INDIO_DIRECT_MODE;
if (ring->setup_ops->postdisable) { if (buffer->setup_ops->postdisable) {
ret = ring->setup_ops->postdisable(dev_info); ret = buffer->setup_ops->postdisable(dev_info);
if (ret) if (ret)
goto error_ret; goto error_ret;
} }
...@@ -511,42 +512,42 @@ ssize_t iio_store_ring_enable(struct device *dev, ...@@ -511,42 +512,42 @@ ssize_t iio_store_ring_enable(struct device *dev,
mutex_unlock(&dev_info->mlock); mutex_unlock(&dev_info->mlock);
return ret; return ret;
} }
EXPORT_SYMBOL(iio_store_ring_enable); EXPORT_SYMBOL(iio_buffer_store_enable);
ssize_t iio_show_ring_enable(struct device *dev, ssize_t iio_buffer_show_enable(struct device *dev,
struct device_attribute *attr, struct device_attribute *attr,
char *buf) char *buf)
{ {
struct iio_dev *dev_info = dev_get_drvdata(dev); struct iio_dev *dev_info = dev_get_drvdata(dev);
return sprintf(buf, "%d\n", !!(dev_info->currentmode return sprintf(buf, "%d\n", !!(dev_info->currentmode
& INDIO_ALL_BUFFER_MODES)); & INDIO_ALL_BUFFER_MODES));
} }
EXPORT_SYMBOL(iio_show_ring_enable); EXPORT_SYMBOL(iio_buffer_show_enable);
int iio_sw_ring_preenable(struct iio_dev *indio_dev) int iio_sw_buffer_preenable(struct iio_dev *indio_dev)
{ {
struct iio_ring_buffer *ring = indio_dev->ring; struct iio_buffer *buffer = indio_dev->buffer;
size_t size; size_t size;
dev_dbg(&indio_dev->dev, "%s\n", __func__); dev_dbg(&indio_dev->dev, "%s\n", __func__);
/* Check if there are any scan elements enabled, if not fail*/ /* Check if there are any scan elements enabled, if not fail*/
if (!(ring->scan_count || ring->scan_timestamp)) if (!(buffer->scan_count || buffer->scan_timestamp))
return -EINVAL; return -EINVAL;
if (ring->scan_timestamp) if (buffer->scan_timestamp)
if (ring->scan_count) if (buffer->scan_count)
/* Timestamp (aligned to s64) and data */ /* Timestamp (aligned to s64) and data */
size = (((ring->scan_count * ring->bpe) size = (((buffer->scan_count * buffer->bpe)
+ sizeof(s64) - 1) + sizeof(s64) - 1)
& ~(sizeof(s64) - 1)) & ~(sizeof(s64) - 1))
+ sizeof(s64); + sizeof(s64);
else /* Timestamp only */ else /* Timestamp only */
size = sizeof(s64); size = sizeof(s64);
else /* Data only */ else /* Data only */
size = ring->scan_count * ring->bpe; size = buffer->scan_count * buffer->bpe;
ring->access->set_bytes_per_datum(ring, size); buffer->access->set_bytes_per_datum(buffer, size);
return 0; return 0;
} }
EXPORT_SYMBOL(iio_sw_ring_preenable); EXPORT_SYMBOL(iio_sw_buffer_preenable);
/* note NULL used as error indicator as it doesn't make sense. */ /* note NULL used as error indicator as it doesn't make sense. */
...@@ -566,12 +567,12 @@ static unsigned long *iio_scan_mask_match(unsigned long *av_masks, ...@@ -566,12 +567,12 @@ static unsigned long *iio_scan_mask_match(unsigned long *av_masks,
/** /**
* iio_scan_mask_set() - set particular bit in the scan mask * iio_scan_mask_set() - set particular bit in the scan mask
* @ring: the ring buffer whose scan mask we are interested in * @buffer: the buffer whose scan mask we are interested in
* @bit: the bit to be set. * @bit: the bit to be set.
**/ **/
int iio_scan_mask_set(struct iio_ring_buffer *ring, int bit) int iio_scan_mask_set(struct iio_buffer *buffer, int bit)
{ {
struct iio_dev *dev_info = ring->indio_dev; struct iio_dev *dev_info = buffer->indio_dev;
unsigned long *mask; unsigned long *mask;
unsigned long *trialmask; unsigned long *trialmask;
...@@ -582,11 +583,11 @@ int iio_scan_mask_set(struct iio_ring_buffer *ring, int bit) ...@@ -582,11 +583,11 @@ int iio_scan_mask_set(struct iio_ring_buffer *ring, int bit)
if (trialmask == NULL) if (trialmask == NULL)
return -ENOMEM; return -ENOMEM;
if (!dev_info->masklength) { if (!dev_info->masklength) {
WARN_ON("trying to set scan mask prior to registering ring\n"); WARN_ON("trying to set scanmask prior to registering buffer\n");
kfree(trialmask); kfree(trialmask);
return -EINVAL; return -EINVAL;
} }
bitmap_copy(trialmask, ring->scan_mask, dev_info->masklength); bitmap_copy(trialmask, buffer->scan_mask, dev_info->masklength);
set_bit(bit, trialmask); set_bit(bit, trialmask);
if (dev_info->available_scan_masks) { if (dev_info->available_scan_masks) {
...@@ -598,8 +599,8 @@ int iio_scan_mask_set(struct iio_ring_buffer *ring, int bit) ...@@ -598,8 +599,8 @@ int iio_scan_mask_set(struct iio_ring_buffer *ring, int bit)
return -EINVAL; return -EINVAL;
} }
} }
bitmap_copy(ring->scan_mask, trialmask, dev_info->masklength); bitmap_copy(buffer->scan_mask, trialmask, dev_info->masklength);
ring->scan_count++; buffer->scan_count++;
kfree(trialmask); kfree(trialmask);
...@@ -607,22 +608,22 @@ int iio_scan_mask_set(struct iio_ring_buffer *ring, int bit) ...@@ -607,22 +608,22 @@ int iio_scan_mask_set(struct iio_ring_buffer *ring, int bit)
}; };
EXPORT_SYMBOL_GPL(iio_scan_mask_set); EXPORT_SYMBOL_GPL(iio_scan_mask_set);
int iio_scan_mask_query(struct iio_ring_buffer *ring, int bit) int iio_scan_mask_query(struct iio_buffer *buffer, int bit)
{ {
struct iio_dev *dev_info = ring->indio_dev; struct iio_dev *dev_info = buffer->indio_dev;
long *mask; long *mask;
if (bit > dev_info->masklength) if (bit > dev_info->masklength)
return -EINVAL; return -EINVAL;
if (!ring->scan_mask) if (!buffer->scan_mask)
return 0; return 0;
if (dev_info->available_scan_masks) if (dev_info->available_scan_masks)
mask = iio_scan_mask_match(dev_info->available_scan_masks, mask = iio_scan_mask_match(dev_info->available_scan_masks,
dev_info->masklength, dev_info->masklength,
ring->scan_mask); buffer->scan_mask);
else else
mask = ring->scan_mask; mask = buffer->scan_mask;
if (!mask) if (!mask)
return 0; return 0;
......
drivers/staging/iio/industrialio-core.c
View file @ 14555b14
...@@ -1058,23 +1058,23 @@ void iio_free_device(struct iio_dev *dev) ...@@ -1058,23 +1058,23 @@ void iio_free_device(struct iio_dev *dev)
EXPORT_SYMBOL(iio_free_device); EXPORT_SYMBOL(iio_free_device);
/** /**
* iio_chrdev_open() - chrdev file open for ring buffer access and ioctls * iio_chrdev_open() - chrdev file open for buffer access and ioctls
**/ **/
static int iio_chrdev_open(struct inode *inode, struct file *filp) static int iio_chrdev_open(struct inode *inode, struct file *filp)
{ {
struct iio_dev *dev_info = container_of(inode->i_cdev, struct iio_dev *dev_info = container_of(inode->i_cdev,
struct iio_dev, chrdev); struct iio_dev, chrdev);
filp->private_data = dev_info; filp->private_data = dev_info;
iio_chrdev_ring_open(dev_info); iio_chrdev_buffer_open(dev_info);
return 0; return 0;
} }
/** /**
* iio_chrdev_release() - chrdev file close ring buffer access and ioctls * iio_chrdev_release() - chrdev file close buffer access and ioctls
**/ **/
static int iio_chrdev_release(struct inode *inode, struct file *filp) static int iio_chrdev_release(struct inode *inode, struct file *filp)
{ {
iio_chrdev_ring_release(container_of(inode->i_cdev, iio_chrdev_buffer_release(container_of(inode->i_cdev,
struct iio_dev, chrdev)); struct iio_dev, chrdev));
return 0; return 0;
} }
...@@ -1096,11 +1096,11 @@ static long iio_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) ...@@ -1096,11 +1096,11 @@ static long iio_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
return -EINVAL; return -EINVAL;
} }
static const struct file_operations iio_ring_fileops = { static const struct file_operations iio_buffer_fileops = {
.read = iio_ring_read_first_n_outer_addr, .read = iio_buffer_read_first_n_outer_addr,
.release = iio_chrdev_release, .release = iio_chrdev_release,
.open = iio_chrdev_open, .open = iio_chrdev_open,
.poll = iio_ring_poll_addr, .poll = iio_buffer_poll_addr,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.llseek = noop_llseek, .llseek = noop_llseek,
.unlocked_ioctl = iio_ioctl, .unlocked_ioctl = iio_ioctl,
...@@ -1132,7 +1132,7 @@ int iio_device_register(struct iio_dev *dev_info) ...@@ -1132,7 +1132,7 @@ int iio_device_register(struct iio_dev *dev_info)
ret = device_add(&dev_info->dev); ret = device_add(&dev_info->dev);
if (ret < 0) if (ret < 0)
goto error_unreg_eventset; goto error_unreg_eventset;
cdev_init(&dev_info->chrdev, &iio_ring_fileops); cdev_init(&dev_info->chrdev, &iio_buffer_fileops);
dev_info->chrdev.owner = dev_info->info->driver_module; dev_info->chrdev.owner = dev_info->info->driver_module;
ret = cdev_add(&dev_info->chrdev, dev_info->dev.devt, 1); ret = cdev_add(&dev_info->chrdev, dev_info->dev.devt, 1);
if (ret < 0) if (ret < 0)
......
drivers/staging/iio/kfifo_buf.c
View file @ 14555b14
...@@ -9,14 +9,14 @@ ...@@ -9,14 +9,14 @@
#include "kfifo_buf.h" #include "kfifo_buf.h"
struct iio_kfifo { struct iio_kfifo {
struct iio_ring_buffer ring; struct iio_buffer buffer;
struct kfifo kf; struct kfifo kf;
int use_count; int use_count;
int update_needed; int update_needed;
struct mutex use_lock; struct mutex use_lock;
}; };
#define iio_to_kfifo(r) container_of(r, struct iio_kfifo, ring) #define iio_to_kfifo(r) container_of(r, struct iio_kfifo, buffer)
static inline int __iio_allocate_kfifo(struct iio_kfifo *buf, static inline int __iio_allocate_kfifo(struct iio_kfifo *buf,
int bytes_per_datum, int length) int bytes_per_datum, int length)
...@@ -24,11 +24,11 @@ static inline int __iio_allocate_kfifo(struct iio_kfifo *buf, ...@@ -24,11 +24,11 @@ static inline int __iio_allocate_kfifo(struct iio_kfifo *buf,
if ((length == 0) || (bytes_per_datum == 0)) if ((length == 0) || (bytes_per_datum == 0))
return -EINVAL; return -EINVAL;
__iio_update_ring_buffer(&buf->ring, bytes_per_datum, length); __iio_update_buffer(&buf->buffer, bytes_per_datum, length);
return kfifo_alloc(&buf->kf, bytes_per_datum*length, GFP_KERNEL); return kfifo_alloc(&buf->kf, bytes_per_datum*length, GFP_KERNEL);
} }
static int iio_request_update_kfifo(struct iio_ring_buffer *r) static int iio_request_update_kfifo(struct iio_buffer *r)
{ {
int ret = 0; int ret = 0;
struct iio_kfifo *buf = iio_to_kfifo(r); struct iio_kfifo *buf = iio_to_kfifo(r);
...@@ -41,14 +41,14 @@ static int iio_request_update_kfifo(struct iio_ring_buffer *r) ...@@ -41,14 +41,14 @@ static int iio_request_update_kfifo(struct iio_ring_buffer *r)
goto error_ret; goto error_ret;
} }
kfifo_free(&buf->kf); kfifo_free(&buf->kf);
ret = __iio_allocate_kfifo(buf, buf->ring.bytes_per_datum, ret = __iio_allocate_kfifo(buf, buf->buffer.bytes_per_datum,
buf->ring.length); buf->buffer.length);
error_ret: error_ret:
mutex_unlock(&buf->use_lock); mutex_unlock(&buf->use_lock);
return ret; return ret;
} }
static void iio_mark_kfifo_in_use(struct iio_ring_buffer *r) static void iio_mark_kfifo_in_use(struct iio_buffer *r)
{ {
struct iio_kfifo *buf = iio_to_kfifo(r); struct iio_kfifo *buf = iio_to_kfifo(r);
mutex_lock(&buf->use_lock); mutex_lock(&buf->use_lock);
...@@ -56,7 +56,7 @@ static void iio_mark_kfifo_in_use(struct iio_ring_buffer *r) ...@@ -56,7 +56,7 @@ static void iio_mark_kfifo_in_use(struct iio_ring_buffer *r)
mutex_unlock(&buf->use_lock); mutex_unlock(&buf->use_lock);
} }
static void iio_unmark_kfifo_in_use(struct iio_ring_buffer *r) static void iio_unmark_kfifo_in_use(struct iio_buffer *r)
{ {
struct iio_kfifo *buf = iio_to_kfifo(r); struct iio_kfifo *buf = iio_to_kfifo(r);
mutex_lock(&buf->use_lock); mutex_lock(&buf->use_lock);
...@@ -64,7 +64,7 @@ static void iio_unmark_kfifo_in_use(struct iio_ring_buffer *r) ...@@ -64,7 +64,7 @@ static void iio_unmark_kfifo_in_use(struct iio_ring_buffer *r)
mutex_unlock(&buf->use_lock); mutex_unlock(&buf->use_lock);
} }
static int iio_get_length_kfifo(struct iio_ring_buffer *r) static int iio_get_length_kfifo(struct iio_buffer *r)
{ {
return r->length; return r->length;
} }
...@@ -74,9 +74,9 @@ static inline void __iio_init_kfifo(struct iio_kfifo *kf) ...@@ -74,9 +74,9 @@ static inline void __iio_init_kfifo(struct iio_kfifo *kf)
mutex_init(&kf->use_lock); mutex_init(&kf->use_lock);
} }
static IIO_RING_ENABLE_ATTR; static IIO_BUFFER_ENABLE_ATTR;
static IIO_RING_BYTES_PER_DATUM_ATTR; static IIO_BUFFER_BYTES_PER_DATUM_ATTR;
static IIO_RING_LENGTH_ATTR; static IIO_BUFFER_LENGTH_ATTR;
static struct attribute *iio_kfifo_attributes[] = { static struct attribute *iio_kfifo_attributes[] = {
&dev_attr_length.attr, &dev_attr_length.attr,
...@@ -90,7 +90,7 @@ static struct attribute_group iio_kfifo_attribute_group = { ...@@ -90,7 +90,7 @@ static struct attribute_group iio_kfifo_attribute_group = {
.name = "buffer", .name = "buffer",
}; };
struct iio_ring_buffer *iio_kfifo_allocate(struct iio_dev *indio_dev) struct iio_buffer *iio_kfifo_allocate(struct iio_dev *indio_dev)
{ {
struct iio_kfifo *kf; struct iio_kfifo *kf;
...@@ -98,20 +98,20 @@ struct iio_ring_buffer *iio_kfifo_allocate(struct iio_dev *indio_dev) ...@@ -98,20 +98,20 @@ struct iio_ring_buffer *iio_kfifo_allocate(struct iio_dev *indio_dev)
if (!kf) if (!kf)
return NULL; return NULL;
kf->update_needed = true; kf->update_needed = true;
iio_ring_buffer_init(&kf->ring, indio_dev); iio_buffer_init(&kf->buffer, indio_dev);
kf->ring.attrs = &iio_kfifo_attribute_group; kf->buffer.attrs = &iio_kfifo_attribute_group;
__iio_init_kfifo(kf); __iio_init_kfifo(kf);
return &kf->ring; return &kf->buffer;
} }
EXPORT_SYMBOL(iio_kfifo_allocate); EXPORT_SYMBOL(iio_kfifo_allocate);
static int iio_get_bytes_per_datum_kfifo(struct iio_ring_buffer *r) static int iio_get_bytes_per_datum_kfifo(struct iio_buffer *r)
{ {
return r->bytes_per_datum; return r->bytes_per_datum;
} }
static int iio_set_bytes_per_datum_kfifo(struct iio_ring_buffer *r, size_t bpd) static int iio_set_bytes_per_datum_kfifo(struct iio_buffer *r, size_t bpd)
{ {
if (r->bytes_per_datum != bpd) { if (r->bytes_per_datum != bpd) {
r->bytes_per_datum = bpd; r->bytes_per_datum = bpd;
...@@ -121,14 +121,14 @@ static int iio_set_bytes_per_datum_kfifo(struct iio_ring_buffer *r, size_t bpd) ...@@ -121,14 +121,14 @@ static int iio_set_bytes_per_datum_kfifo(struct iio_ring_buffer *r, size_t bpd)
return 0; return 0;
} }
static int iio_mark_update_needed_kfifo(struct iio_ring_buffer *r) static int iio_mark_update_needed_kfifo(struct iio_buffer *r)
{ {
struct iio_kfifo *kf = iio_to_kfifo(r); struct iio_kfifo *kf = iio_to_kfifo(r);
kf->update_needed = true; kf->update_needed = true;
return 0; return 0;
} }
static int iio_set_length_kfifo(struct iio_ring_buffer *r, int length) static int iio_set_length_kfifo(struct iio_buffer *r, int length)
{ {
if (r->length != length) { if (r->length != length) {
r->length = length; r->length = length;
...@@ -138,13 +138,13 @@ static int iio_set_length_kfifo(struct iio_ring_buffer *r, int length) ...@@ -138,13 +138,13 @@ static int iio_set_length_kfifo(struct iio_ring_buffer *r, int length)
return 0; return 0;
} }
void iio_kfifo_free(struct iio_ring_buffer *r) void iio_kfifo_free(struct iio_buffer *r)
{ {
kfree(iio_to_kfifo(r)); kfree(iio_to_kfifo(r));
} }
EXPORT_SYMBOL(iio_kfifo_free); EXPORT_SYMBOL(iio_kfifo_free);
static int iio_store_to_kfifo(struct iio_ring_buffer *r, static int iio_store_to_kfifo(struct iio_buffer *r,
u8 *data, u8 *data,
s64 timestamp) s64 timestamp)
{ {
...@@ -163,7 +163,7 @@ static int iio_store_to_kfifo(struct iio_ring_buffer *r, ...@@ -163,7 +163,7 @@ static int iio_store_to_kfifo(struct iio_ring_buffer *r,
return 0; return 0;
} }
static int iio_read_first_n_kfifo(struct iio_ring_buffer *r, static int iio_read_first_n_kfifo(struct iio_buffer *r,
size_t n, char __user *buf) size_t n, char __user *buf)
{ {
int ret, copied; int ret, copied;
...@@ -174,7 +174,7 @@ static int iio_read_first_n_kfifo(struct iio_ring_buffer *r, ...@@ -174,7 +174,7 @@ static int iio_read_first_n_kfifo(struct iio_ring_buffer *r,
return copied; return copied;
} }
const struct iio_ring_access_funcs kfifo_access_funcs = { const struct iio_buffer_access_funcs kfifo_access_funcs = {
.mark_in_use = &iio_mark_kfifo_in_use, .mark_in_use = &iio_mark_kfifo_in_use,
.unmark_in_use = &iio_unmark_kfifo_in_use, .unmark_in_use = &iio_unmark_kfifo_in_use,
.store_to = &iio_store_to_kfifo, .store_to = &iio_store_to_kfifo,
......
drivers/staging/iio/kfifo_buf.h
View file @ 14555b14
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
#include "iio.h" #include "iio.h"
#include "buffer_generic.h" #include "buffer_generic.h"
extern const struct iio_ring_access_funcs kfifo_access_funcs; extern const struct iio_buffer_access_funcs kfifo_access_funcs;
struct iio_ring_buffer *iio_kfifo_allocate(struct iio_dev *indio_dev); struct iio_buffer *iio_kfifo_allocate(struct iio_dev *indio_dev);
void iio_kfifo_free(struct iio_ring_buffer *r); void iio_kfifo_free(struct iio_buffer *r);
drivers/staging/iio/meter/ade7758_core.c
View file @ 14555b14
...@@ -775,9 +775,9 @@ static int __devinit ade7758_probe(struct spi_device *spi) ...@@ -775,9 +775,9 @@ static int __devinit ade7758_probe(struct spi_device *spi)
if (ret) if (ret)
goto error_free_tx; goto error_free_tx;
ret = iio_ring_buffer_register(indio_dev, ret = iio_buffer_register(indio_dev,
&ade7758_channels[0], &ade7758_channels[0],
ARRAY_SIZE(ade7758_channels)); ARRAY_SIZE(ade7758_channels));
if (ret) { if (ret) {
dev_err(&spi->dev, "failed to initialize the ring\n"); dev_err(&spi->dev, "failed to initialize the ring\n");
goto error_unreg_ring_funcs; goto error_unreg_ring_funcs;
......
drivers/staging/iio/meter/ade7758_ring.c
View file @ 14555b14
...@@ -61,7 +61,7 @@ static irqreturn_t ade7758_trigger_handler(int irq, void *p) ...@@ -61,7 +61,7 @@ static irqreturn_t ade7758_trigger_handler(int irq, void *p)
{ {
struct iio_poll_func *pf = p; struct iio_poll_func *pf = p;
struct iio_dev *indio_dev = pf->indio_dev; struct iio_dev *indio_dev = pf->indio_dev;
struct iio_ring_buffer *ring = indio_dev->ring; struct iio_buffer *ring = indio_dev->buffer;
struct ade7758_state *st = iio_priv(indio_dev); struct ade7758_state *st = iio_priv(indio_dev);
s64 dat64[2]; s64 dat64[2];
u32 *dat32 = (u32 *)dat64; u32 *dat32 = (u32 *)dat64;
...@@ -91,7 +91,7 @@ static irqreturn_t ade7758_trigger_handler(int irq, void *p) ...@@ -91,7 +91,7 @@ static irqreturn_t ade7758_trigger_handler(int irq, void *p)
static int ade7758_ring_preenable(struct iio_dev *indio_dev) static int ade7758_ring_preenable(struct iio_dev *indio_dev)
{ {
struct ade7758_state *st = iio_priv(indio_dev); struct ade7758_state *st = iio_priv(indio_dev);
struct iio_ring_buffer *ring = indio_dev->ring; struct iio_buffer *ring = indio_dev->buffer;
size_t d_size; size_t d_size;
unsigned channel; unsigned channel;
...@@ -109,9 +109,9 @@ static int ade7758_ring_preenable(struct iio_dev *indio_dev) ...@@ -109,9 +109,9 @@ static int ade7758_ring_preenable(struct iio_dev *indio_dev)
d_size += sizeof(s64) - (d_size % sizeof(s64)); d_size += sizeof(s64) - (d_size % sizeof(s64));
} }
if (indio_dev->ring->access->set_bytes_per_datum) if (indio_dev->buffer->access->set_bytes_per_datum)
indio_dev->ring->access->set_bytes_per_datum(indio_dev->ring, indio_dev->buffer->access->
d_size); set_bytes_per_datum(indio_dev->buffer, d_size);
ade7758_write_waveform_type(&indio_dev->dev, ade7758_write_waveform_type(&indio_dev->dev,
st->ade7758_ring_channels[channel].address); st->ade7758_ring_channels[channel].address);
...@@ -119,7 +119,7 @@ static int ade7758_ring_preenable(struct iio_dev *indio_dev) ...@@ -119,7 +119,7 @@ static int ade7758_ring_preenable(struct iio_dev *indio_dev)
return 0; return 0;
} }
static const struct iio_ring_setup_ops ade7758_ring_setup_ops = { static const struct iio_buffer_setup_ops ade7758_ring_setup_ops = {
.preenable = &ade7758_ring_preenable, .preenable = &ade7758_ring_preenable,
.postenable = &iio_triggered_buffer_postenable, .postenable = &iio_triggered_buffer_postenable,
.predisable = &iio_triggered_buffer_predisable, .predisable = &iio_triggered_buffer_predisable,
...@@ -128,7 +128,7 @@ static const struct iio_ring_setup_ops ade7758_ring_setup_ops = { ...@@ -128,7 +128,7 @@ static const struct iio_ring_setup_ops ade7758_ring_setup_ops = {
void ade7758_unconfigure_ring(struct iio_dev *indio_dev) void ade7758_unconfigure_ring(struct iio_dev *indio_dev)
{ {
iio_dealloc_pollfunc(indio_dev->pollfunc); iio_dealloc_pollfunc(indio_dev->pollfunc);
iio_sw_rb_free(indio_dev->ring); iio_sw_rb_free(indio_dev->buffer);
} }
int ade7758_configure_ring(struct iio_dev *indio_dev) int ade7758_configure_ring(struct iio_dev *indio_dev)
...@@ -136,16 +136,16 @@ int ade7758_configure_ring(struct iio_dev *indio_dev) ...@@ -136,16 +136,16 @@ int ade7758_configure_ring(struct iio_dev *indio_dev)
struct ade7758_state *st = iio_priv(indio_dev); struct ade7758_state *st = iio_priv(indio_dev);
int ret = 0; int ret = 0;
indio_dev->ring = iio_sw_rb_allocate(indio_dev); indio_dev->buffer = iio_sw_rb_allocate(indio_dev);
if (!indio_dev->ring) { if (!indio_dev->buffer) {
ret = -ENOMEM; ret = -ENOMEM;
return ret; return ret;
} }
/* Effectively select the ring buffer implementation */ /* Effectively select the ring buffer implementation */
indio_dev->ring->access = &ring_sw_access_funcs; indio_dev->buffer->access = &ring_sw_access_funcs;
indio_dev->ring->setup_ops = &ade7758_ring_setup_ops; indio_dev->buffer->setup_ops = &ade7758_ring_setup_ops;
indio_dev->ring->owner = THIS_MODULE; indio_dev->buffer->owner = THIS_MODULE;
indio_dev->pollfunc = iio_alloc_pollfunc(&iio_pollfunc_store_time, indio_dev->pollfunc = iio_alloc_pollfunc(&iio_pollfunc_store_time,
&ade7758_trigger_handler, &ade7758_trigger_handler,
...@@ -196,11 +196,11 @@ int ade7758_configure_ring(struct iio_dev *indio_dev) ...@@ -196,11 +196,11 @@ int ade7758_configure_ring(struct iio_dev *indio_dev)
return 0; return 0;
error_iio_sw_rb_free: error_iio_sw_rb_free:
iio_sw_rb_free(indio_dev->ring); iio_sw_rb_free(indio_dev->buffer);
return ret; return ret;
} }
void ade7758_uninitialize_ring(struct iio_dev *indio_dev) void ade7758_uninitialize_ring(struct iio_dev *indio_dev)
{ {
iio_ring_buffer_unregister(indio_dev); iio_buffer_unregister(indio_dev);
} }
drivers/staging/iio/ring_hw.h
View file @ 14555b14
...@@ -14,9 +14,9 @@ ...@@ -14,9 +14,9 @@
* @buf: generic ring buffer elements * @buf: generic ring buffer elements
* @private: device specific data * @private: device specific data
*/ */
struct iio_hw_ring_buffer { struct iio_hw_buffer {
struct iio_ring_buffer buf; struct iio_buffer buf;
void *private; void *private;
}; };
#define iio_to_hw_ring_buf(r) container_of(r, struct iio_hw_ring_buffer, buf) #define iio_to_hw_buf(r) container_of(r, struct iio_hw_buffer, buf)
drivers/staging/iio/ring_sw.c
View file @ 14555b14
...@@ -30,10 +30,10 @@ ...@@ -30,10 +30,10 @@
* @use_lock: lock to prevent change in size when in use * @use_lock: lock to prevent change in size when in use
* *
* Note that the first element of all ring buffers must be a * Note that the first element of all ring buffers must be a
* struct iio_ring_buffer. * struct iio_buffer.
**/ **/
struct iio_sw_ring_buffer { struct iio_sw_ring_buffer {
struct iio_ring_buffer buf; struct iio_buffer buf;
unsigned char *data; unsigned char *data;
unsigned char *read_p; unsigned char *read_p;
unsigned char *write_p; unsigned char *write_p;
...@@ -52,7 +52,7 @@ static inline int __iio_allocate_sw_ring_buffer(struct iio_sw_ring_buffer *ring, ...@@ -52,7 +52,7 @@ static inline int __iio_allocate_sw_ring_buffer(struct iio_sw_ring_buffer *ring,
{ {
if ((length == 0) || (bytes_per_datum == 0)) if ((length == 0) || (bytes_per_datum == 0))
return -EINVAL; return -EINVAL;
__iio_update_ring_buffer(&ring->buf, bytes_per_datum, length); __iio_update_buffer(&ring->buf, bytes_per_datum, length);
ring->data = kmalloc(length*ring->buf.bytes_per_datum, GFP_ATOMIC); ring->data = kmalloc(length*ring->buf.bytes_per_datum, GFP_ATOMIC);
ring->read_p = NULL; ring->read_p = NULL;
ring->write_p = NULL; ring->write_p = NULL;
...@@ -71,7 +71,7 @@ static inline void __iio_free_sw_ring_buffer(struct iio_sw_ring_buffer *ring) ...@@ -71,7 +71,7 @@ static inline void __iio_free_sw_ring_buffer(struct iio_sw_ring_buffer *ring)
kfree(ring->data); kfree(ring->data);
} }
static void iio_mark_sw_rb_in_use(struct iio_ring_buffer *r) static void iio_mark_sw_rb_in_use(struct iio_buffer *r)
{ {
struct iio_sw_ring_buffer *ring = iio_to_sw_ring(r); struct iio_sw_ring_buffer *ring = iio_to_sw_ring(r);
spin_lock(&ring->use_lock); spin_lock(&ring->use_lock);
...@@ -79,7 +79,7 @@ static void iio_mark_sw_rb_in_use(struct iio_ring_buffer *r) ...@@ -79,7 +79,7 @@ static void iio_mark_sw_rb_in_use(struct iio_ring_buffer *r)
spin_unlock(&ring->use_lock); spin_unlock(&ring->use_lock);
} }
static void iio_unmark_sw_rb_in_use(struct iio_ring_buffer *r) static void iio_unmark_sw_rb_in_use(struct iio_buffer *r)
{ {
struct iio_sw_ring_buffer *ring = iio_to_sw_ring(r); struct iio_sw_ring_buffer *ring = iio_to_sw_ring(r);
spin_lock(&ring->use_lock); spin_lock(&ring->use_lock);
...@@ -166,7 +166,7 @@ static int iio_store_to_sw_ring(struct iio_sw_ring_buffer *ring, ...@@ -166,7 +166,7 @@ static int iio_store_to_sw_ring(struct iio_sw_ring_buffer *ring,
return ret; return ret;
} }
static int iio_read_first_n_sw_rb(struct iio_ring_buffer *r, static int iio_read_first_n_sw_rb(struct iio_buffer *r,
size_t n, char __user *buf) size_t n, char __user *buf)
{ {
struct iio_sw_ring_buffer *ring = iio_to_sw_ring(r); struct iio_sw_ring_buffer *ring = iio_to_sw_ring(r);
...@@ -297,7 +297,7 @@ static int iio_read_first_n_sw_rb(struct iio_ring_buffer *r, ...@@ -297,7 +297,7 @@ static int iio_read_first_n_sw_rb(struct iio_ring_buffer *r,
return ret; return ret;
} }
static int iio_store_to_sw_rb(struct iio_ring_buffer *r, static int iio_store_to_sw_rb(struct iio_buffer *r,
u8 *data, u8 *data,
s64 timestamp) s64 timestamp)
{ {
...@@ -327,13 +327,13 @@ static int iio_read_last_from_sw_ring(struct iio_sw_ring_buffer *ring, ...@@ -327,13 +327,13 @@ static int iio_read_last_from_sw_ring(struct iio_sw_ring_buffer *ring,
return 0; return 0;
} }
static int iio_read_last_from_sw_rb(struct iio_ring_buffer *r, static int iio_read_last_from_sw_rb(struct iio_buffer *r,
unsigned char *data) unsigned char *data)
{ {
return iio_read_last_from_sw_ring(iio_to_sw_ring(r), data); return iio_read_last_from_sw_ring(iio_to_sw_ring(r), data);
} }
static int iio_request_update_sw_rb(struct iio_ring_buffer *r) static int iio_request_update_sw_rb(struct iio_buffer *r)
{ {
int ret = 0; int ret = 0;
struct iio_sw_ring_buffer *ring = iio_to_sw_ring(r); struct iio_sw_ring_buffer *ring = iio_to_sw_ring(r);
...@@ -354,13 +354,13 @@ static int iio_request_update_sw_rb(struct iio_ring_buffer *r) ...@@ -354,13 +354,13 @@ static int iio_request_update_sw_rb(struct iio_ring_buffer *r)
return ret; return ret;
} }
static int iio_get_bytes_per_datum_sw_rb(struct iio_ring_buffer *r) static int iio_get_bytes_per_datum_sw_rb(struct iio_buffer *r)
{ {
struct iio_sw_ring_buffer *ring = iio_to_sw_ring(r); struct iio_sw_ring_buffer *ring = iio_to_sw_ring(r);
return ring->buf.bytes_per_datum; return ring->buf.bytes_per_datum;
} }
static int iio_set_bytes_per_datum_sw_rb(struct iio_ring_buffer *r, size_t bpd) static int iio_set_bytes_per_datum_sw_rb(struct iio_buffer *r, size_t bpd)
{ {
if (r->bytes_per_datum != bpd) { if (r->bytes_per_datum != bpd) {
r->bytes_per_datum = bpd; r->bytes_per_datum = bpd;
...@@ -370,12 +370,12 @@ static int iio_set_bytes_per_datum_sw_rb(struct iio_ring_buffer *r, size_t bpd) ...@@ -370,12 +370,12 @@ static int iio_set_bytes_per_datum_sw_rb(struct iio_ring_buffer *r, size_t bpd)
return 0; return 0;
} }
static int iio_get_length_sw_rb(struct iio_ring_buffer *r) static int iio_get_length_sw_rb(struct iio_buffer *r)
{ {
return r->length; return r->length;
} }
static int iio_set_length_sw_rb(struct iio_ring_buffer *r, int length) static int iio_set_length_sw_rb(struct iio_buffer *r, int length)
{ {
if (r->length != length) { if (r->length != length) {
r->length = length; r->length = length;
...@@ -385,16 +385,16 @@ static int iio_set_length_sw_rb(struct iio_ring_buffer *r, int length) ...@@ -385,16 +385,16 @@ static int iio_set_length_sw_rb(struct iio_ring_buffer *r, int length)
return 0; return 0;
} }
static int iio_mark_update_needed_sw_rb(struct iio_ring_buffer *r) static int iio_mark_update_needed_sw_rb(struct iio_buffer *r)
{ {
struct iio_sw_ring_buffer *ring = iio_to_sw_ring(r); struct iio_sw_ring_buffer *ring = iio_to_sw_ring(r);
ring->update_needed = true; ring->update_needed = true;
return 0; return 0;
} }
static IIO_RING_ENABLE_ATTR; static IIO_BUFFER_ENABLE_ATTR;
static IIO_RING_BYTES_PER_DATUM_ATTR; static IIO_BUFFER_BYTES_PER_DATUM_ATTR;
static IIO_RING_LENGTH_ATTR; static IIO_BUFFER_LENGTH_ATTR;
/* Standard set of ring buffer attributes */ /* Standard set of ring buffer attributes */
static struct attribute *iio_ring_attributes[] = { static struct attribute *iio_ring_attributes[] = {
...@@ -409,9 +409,9 @@ static struct attribute_group iio_ring_attribute_group = { ...@@ -409,9 +409,9 @@ static struct attribute_group iio_ring_attribute_group = {
.name = "buffer", .name = "buffer",
}; };
struct iio_ring_buffer *iio_sw_rb_allocate(struct iio_dev *indio_dev) struct iio_buffer *iio_sw_rb_allocate(struct iio_dev *indio_dev)
{ {
struct iio_ring_buffer *buf; struct iio_buffer *buf;
struct iio_sw_ring_buffer *ring; struct iio_sw_ring_buffer *ring;
ring = kzalloc(sizeof *ring, GFP_KERNEL); ring = kzalloc(sizeof *ring, GFP_KERNEL);
...@@ -419,7 +419,7 @@ struct iio_ring_buffer *iio_sw_rb_allocate(struct iio_dev *indio_dev) ...@@ -419,7 +419,7 @@ struct iio_ring_buffer *iio_sw_rb_allocate(struct iio_dev *indio_dev)
return NULL; return NULL;
ring->update_needed = true; ring->update_needed = true;
buf = &ring->buf; buf = &ring->buf;
iio_ring_buffer_init(buf, indio_dev); iio_buffer_init(buf, indio_dev);
__iio_init_sw_ring_buffer(ring); __iio_init_sw_ring_buffer(ring);
buf->attrs = &iio_ring_attribute_group; buf->attrs = &iio_ring_attribute_group;
...@@ -427,13 +427,13 @@ struct iio_ring_buffer *iio_sw_rb_allocate(struct iio_dev *indio_dev) ...@@ -427,13 +427,13 @@ struct iio_ring_buffer *iio_sw_rb_allocate(struct iio_dev *indio_dev)
} }
EXPORT_SYMBOL(iio_sw_rb_allocate); EXPORT_SYMBOL(iio_sw_rb_allocate);
void iio_sw_rb_free(struct iio_ring_buffer *r) void iio_sw_rb_free(struct iio_buffer *r)
{ {
kfree(iio_to_sw_ring(r)); kfree(iio_to_sw_ring(r));
} }
EXPORT_SYMBOL(iio_sw_rb_free); EXPORT_SYMBOL(iio_sw_rb_free);
const struct iio_ring_access_funcs ring_sw_access_funcs = { const struct iio_buffer_access_funcs ring_sw_access_funcs = {
.mark_in_use = &iio_mark_sw_rb_in_use, .mark_in_use = &iio_mark_sw_rb_in_use,
.unmark_in_use = &iio_unmark_sw_rb_in_use, .unmark_in_use = &iio_unmark_sw_rb_in_use,
.store_to = &iio_store_to_sw_rb, .store_to = &iio_store_to_sw_rb,
......
drivers/staging/iio/ring_sw.h
View file @ 14555b14
...@@ -28,8 +28,8 @@ ...@@ -28,8 +28,8 @@
/** /**
* ring_sw_access_funcs - access functions for a software ring buffer * ring_sw_access_funcs - access functions for a software ring buffer
**/ **/
extern const struct iio_ring_access_funcs ring_sw_access_funcs; extern const struct iio_buffer_access_funcs ring_sw_access_funcs;
struct iio_ring_buffer *iio_sw_rb_allocate(struct iio_dev *indio_dev); struct iio_buffer *iio_sw_rb_allocate(struct iio_dev *indio_dev);
void iio_sw_rb_free(struct iio_ring_buffer *ring); void iio_sw_rb_free(struct iio_buffer *ring);
#endif /* _IIO_RING_SW_H_ */ #endif /* _IIO_RING_SW_H_ */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7