diff options
| author | Jonathan Cameron <jic23@cam.ac.uk> | 2011-09-21 10:15:57 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-09-27 00:31:53 (GMT) |
| commit | 14555b14455f9acbdf0e500ae96140828a970796 (patch) | |
| tree | 544fdc46abf6257a457b816623540e768e0c9bdc /drivers/staging/iio/adc/ad7887_core.c | |
| parent | 3811cd6291bb5a11c8d830831149d6369e7d3b68 (diff) | |
| download | linux-fsl-qoriq-14555b14455f9acbdf0e500ae96140828a970796.tar.xz | |
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: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/iio/adc/ad7887_core.c')
| -rw-r--r-- | drivers/staging/iio/adc/ad7887_core.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/iio/adc/ad7887_core.c b/drivers/staging/iio/adc/ad7887_core.c index 4a8ffb5..465d715 100644 --- a/drivers/staging/iio/adc/ad7887_core.c +++ b/drivers/staging/iio/adc/ad7887_core.c @@ -44,7 +44,7 @@ static int ad7887_read_raw(struct iio_dev *dev_info, switch (m) { case 0: 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); else ret = ad7887_scan_direct(st, chan->address); @@ -189,9 +189,9 @@ static int __devinit ad7887_probe(struct spi_device *spi) if (ret) goto error_disable_reg; - ret = iio_ring_buffer_register(indio_dev, - indio_dev->channels, - indio_dev->num_channels); + ret = iio_buffer_register(indio_dev, + indio_dev->channels, + indio_dev->num_channels); if (ret) goto error_cleanup_ring; @@ -201,7 +201,7 @@ static int __devinit ad7887_probe(struct spi_device *spi) return 0; error_unregister_ring: - iio_ring_buffer_unregister(indio_dev); + iio_buffer_unregister(indio_dev); error_cleanup_ring: ad7887_ring_cleanup(indio_dev); error_disable_reg: @@ -220,7 +220,7 @@ static int ad7887_remove(struct spi_device *spi) struct iio_dev *indio_dev = spi_get_drvdata(spi); struct ad7887_state *st = iio_priv(indio_dev); - iio_ring_buffer_unregister(indio_dev); + iio_buffer_unregister(indio_dev); ad7887_ring_cleanup(indio_dev); if (!IS_ERR(st->reg)) { regulator_disable(st->reg); |