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/industrialio-core.c | |
| parent | 3b99fb7656a73d483b00fd4777646c00db16b040 (diff) | |
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/industrialio-core.c')
| -rw-r--r-- | drivers/staging/iio/industrialio-core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/iio/industrialio-core.c b/drivers/staging/iio/industrialio-core.c index 8eba592125d0..bfbfcdd67484 100644 --- a/drivers/staging/iio/industrialio-core.c +++ b/drivers/staging/iio/industrialio-core.c @@ -998,7 +998,7 @@ static void iio_dev_release(struct device *device) { struct iio_dev *dev_info = container_of(device, struct iio_dev, dev); cdev_del(&dev_info->chrdev); - if (dev_info->modes & INDIO_RING_TRIGGERED) + if (dev_info->modes & INDIO_BUFFER_TRIGGERED) iio_device_unregister_trigger_consumer(dev_info); iio_device_unregister_eventset(dev_info); iio_device_unregister_sysfs(dev_info); @@ -1126,7 +1126,7 @@ int iio_device_register(struct iio_dev *dev_info) "Failed to register event set\n"); goto error_free_sysfs; } - if (dev_info->modes & INDIO_RING_TRIGGERED) + if (dev_info->modes & INDIO_BUFFER_TRIGGERED) iio_device_register_trigger_consumer(dev_info); ret = device_add(&dev_info->dev); |