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

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

drivers/staging/iio/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


obj-$(CONFIG_IIO) += industrialio.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



obj-$(CONFIG_IIO_SW_RING) += ring_sw.o

drivers/staging/iio/accel/adis16201_core.c

+5 −5
Original line number Diff line number Diff line
@@ -492,7 +492,7 @@ static int __devinit adis16201_probe(struct spi_device *spi) 
	if (ret)

		goto error_free_dev;



	ret = iio_ring_buffer_register(indio_dev,

	ret = iio_buffer_register(indio_dev,

				  adis16201_channels,

				  ARRAY_SIZE(adis16201_channels));

	if (ret) {
@@ -519,7 +519,7 @@ static int __devinit adis16201_probe(struct spi_device *spi) 
error_remove_trigger:

	adis16201_remove_trigger(indio_dev);

error_uninitialize_ring:

	iio_ring_buffer_unregister(indio_dev);

	iio_buffer_unregister(indio_dev);

error_unreg_ring_funcs:

	adis16201_unconfigure_ring(indio_dev);

error_free_dev:
@@ -533,7 +533,7 @@ static int adis16201_remove(struct spi_device *spi) 
	struct iio_dev *indio_dev = spi_get_drvdata(spi);



	adis16201_remove_trigger(indio_dev);

	iio_ring_buffer_unregister(indio_dev);

	iio_buffer_unregister(indio_dev);

	adis16201_unconfigure_ring(indio_dev);

	iio_device_unregister(indio_dev);

drivers/staging/iio/accel/adis16201_ring.c

+7 −7
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ static irqreturn_t adis16201_trigger_handler(int irq, void *p) 
	struct iio_poll_func *pf = p;

	struct iio_dev *indio_dev = pf->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;

	s16 *data;
@@ -94,11 +94,11 @@ static irqreturn_t adis16201_trigger_handler(int irq, void *p) 
void adis16201_unconfigure_ring(struct iio_dev *indio_dev)

{

	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 = {

	.preenable = &iio_sw_ring_preenable,

static const struct iio_buffer_setup_ops adis16201_ring_setup_ops = {

	.preenable = &iio_sw_buffer_preenable,

	.postenable = &iio_triggered_buffer_postenable,

	.predisable = &iio_triggered_buffer_predisable,

};
@@ -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 ret = 0;

	struct iio_ring_buffer *ring;

	struct iio_buffer *ring;



	ring = iio_sw_rb_allocate(indio_dev);

	if (!ring) {

		ret = -ENOMEM;

		return ret;

	}

	indio_dev->ring = ring;

	indio_dev->buffer = ring;

	/* Effectively select the ring buffer implementation */

	ring->bpe = 2;

	ring->scan_timestamp = true;
@@ -135,6 +135,6 @@ int adis16201_configure_ring(struct iio_dev *indio_dev) 
	indio_dev->modes |= INDIO_BUFFER_TRIGGERED;

	return 0;

error_iio_sw_rb_free:

	iio_sw_rb_free(indio_dev->ring);

	iio_sw_rb_free(indio_dev->buffer);

	return ret;

}

drivers/staging/iio/accel/adis16203_core.c

+5 −5
Original line number Diff line number Diff line
@@ -446,7 +446,7 @@ static int __devinit adis16203_probe(struct spi_device *spi) 
	if (ret)

		goto error_free_dev;



	ret = iio_ring_buffer_register(indio_dev,

	ret = iio_buffer_register(indio_dev,

				  adis16203_channels,

				  ARRAY_SIZE(adis16203_channels));

	if (ret) {
@@ -474,7 +474,7 @@ static int __devinit adis16203_probe(struct spi_device *spi) 
error_remove_trigger:

	adis16203_remove_trigger(indio_dev);

error_uninitialize_ring:

	iio_ring_buffer_unregister(indio_dev);

	iio_buffer_unregister(indio_dev);

error_unreg_ring_funcs:

	adis16203_unconfigure_ring(indio_dev);

error_free_dev:
@@ -488,7 +488,7 @@ static int adis16203_remove(struct spi_device *spi) 
	struct iio_dev *indio_dev = spi_get_drvdata(spi);



	adis16203_remove_trigger(indio_dev);

	iio_ring_buffer_unregister(indio_dev);

	iio_buffer_unregister(indio_dev);

	adis16203_unconfigure_ring(indio_dev);

	iio_device_unregister(indio_dev);

drivers/staging/iio/accel/adis16203_ring.c

+7 −7
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ static irqreturn_t adis16203_trigger_handler(int irq, void *p) 
	struct iio_poll_func *pf = p;

	struct iio_dev *indio_dev = pf->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;

	s16 *data;
@@ -96,11 +96,11 @@ static irqreturn_t adis16203_trigger_handler(int irq, void *p) 
void adis16203_unconfigure_ring(struct iio_dev *indio_dev)

{

	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 = {

	.preenable = &iio_sw_ring_preenable,

static const struct iio_buffer_setup_ops adis16203_ring_setup_ops = {

	.preenable = &iio_sw_buffer_preenable,

	.postenable = &iio_triggered_buffer_postenable,

	.predisable = &iio_triggered_buffer_predisable,

};
@@ -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 ret = 0;

	struct iio_ring_buffer *ring;

	struct iio_buffer *ring;



	ring = iio_sw_rb_allocate(indio_dev);

	if (!ring) {

		ret = -ENOMEM;

		return ret;

	}

	indio_dev->ring = ring;

	indio_dev->buffer = ring;

	/* Effectively select the ring buffer implementation */

	ring->bpe = 2;

	ring->scan_timestamp = true;
@@ -138,6 +138,6 @@ int adis16203_configure_ring(struct iio_dev *indio_dev) 
	return 0;



error_iio_sw_rb_free:

	iio_sw_rb_free(indio_dev->ring);

	iio_sw_rb_free(indio_dev->buffer);

	return ret;

}