diff options
| author |   Jonathan Cameron <jic23@cam.ac.uk> | 2011-09-21 11:15:54 +0100 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@suse.de> | 2011-09-26 17:31:52 -0700 |
| commit | ec3afa40c648ed17eb2a83a4b7249deab3631f61 (patch) | |
| tree | 1acd21ddd82be6df44d48d8a5b71cbcbef92f272 /drivers/staging/iio/meter | |
| parent | staging:iio: treewide rename iio_triggered_ring_* to iio_triggered_buffer_* (diff) | |
| download | linux-dev-ec3afa40c648ed17eb2a83a4b7249deab3631f61.tar.xz linux-dev-ec3afa40c648ed17eb2a83a4b7249deab3631f61.zip | |
staging:iio: tree wide IIO_RING_TRIGGERED -> IIO_BUFFER_TRIGGERED
also, IIO_RING_HARDWARE_BUFFER -> IIO_BUFFER_HARDWARE
These aren't always rings so the naming should not imply that.
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/iio/meter')
| -rw-r--r-- | drivers/staging/iio/meter/ade7758_core.c | 2 | ||||
| -rw-r--r-- | drivers/staging/iio/meter/ade7758_ring.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/iio/meter/ade7758_core.c b/drivers/staging/iio/meter/ade7758_core.c index 6507875f8461..1661f31184be 100644 --- a/drivers/staging/iio/meter/ade7758_core.c +++ b/drivers/staging/iio/meter/ade7758_core.c @@ -801,7 +801,7 @@ static int __devinit ade7758_probe(struct spi_device *spi) return 0; error_remove_trigger: - if (indio_dev->modes & INDIO_RING_TRIGGERED) + if (indio_dev->modes & INDIO_BUFFER_TRIGGERED) ade7758_remove_trigger(indio_dev); error_uninitialize_ring: ade7758_uninitialize_ring(indio_dev); diff --git a/drivers/staging/iio/meter/ade7758_ring.c b/drivers/staging/iio/meter/ade7758_ring.c index ece2a4076eee..8c7541ec3210 100644 --- a/drivers/staging/iio/meter/ade7758_ring.c +++ b/drivers/staging/iio/meter/ade7758_ring.c @@ -158,7 +158,7 @@ int ade7758_configure_ring(struct iio_dev *indio_dev) goto error_iio_sw_rb_free; } - indio_dev->modes |= INDIO_RING_TRIGGERED; + indio_dev->modes |= INDIO_BUFFER_TRIGGERED; st->tx_buf[0] = ADE7758_READ_REG(ADE7758_RSTATUS); st->tx_buf[1] = 0; |