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-ring.c | |
| parent | 3b99fb7656a73d483b00fd4777646c00db16b040 (diff) | |
| download | linux-3.10-ec3afa40c648ed17eb2a83a4b7249deab3631f61.tar.gz linux-3.10-ec3afa40c648ed17eb2a83a4b7249deab3631f61.tar.bz2 linux-3.10-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/industrialio-ring.c')
| -rw-r--r-- | drivers/staging/iio/industrialio-ring.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/staging/iio/industrialio-ring.c b/drivers/staging/iio/industrialio-ring.c index 7a95fbe0eed..e048d348bbd 100644 --- a/drivers/staging/iio/industrialio-ring.c +++ b/drivers/staging/iio/industrialio-ring.c @@ -150,7 +150,7 @@ static ssize_t iio_scan_el_store(struct device *dev, state = !(buf[0] == '0'); mutex_lock(&indio_dev->mlock); - if (indio_dev->currentmode == INDIO_RING_TRIGGERED) { + if (indio_dev->currentmode == INDIO_BUFFER_TRIGGERED) { ret = -EBUSY; goto error_ret; } @@ -193,7 +193,7 @@ static ssize_t iio_scan_el_ts_store(struct device *dev, state = !(buf[0] == '0'); mutex_lock(&indio_dev->mlock); - if (indio_dev->currentmode == INDIO_RING_TRIGGERED) { + if (indio_dev->currentmode == INDIO_BUFFER_TRIGGERED) { ret = -EBUSY; goto error_ret; } @@ -430,7 +430,7 @@ ssize_t iio_store_ring_enable(struct device *dev, mutex_lock(&dev_info->mlock); previous_mode = dev_info->currentmode; requested_state = !(buf[0] == '0'); - current_state = !!(previous_mode & INDIO_ALL_RING_MODES); + current_state = !!(previous_mode & INDIO_ALL_BUFFER_MODES); if (current_state == requested_state) { printk(KERN_INFO "iio-ring, current state requested again\n"); goto done; @@ -457,7 +457,7 @@ ssize_t iio_store_ring_enable(struct device *dev, if (ring->access->mark_in_use) ring->access->mark_in_use(ring); /* Definitely possible for devices to support both of these.*/ - if (dev_info->modes & INDIO_RING_TRIGGERED) { + if (dev_info->modes & INDIO_BUFFER_TRIGGERED) { if (!dev_info->trig) { printk(KERN_INFO "Buffer not started: no trigger\n"); @@ -466,9 +466,9 @@ ssize_t iio_store_ring_enable(struct device *dev, ring->access->unmark_in_use(ring); goto error_ret; } - dev_info->currentmode = INDIO_RING_TRIGGERED; - } else if (dev_info->modes & INDIO_RING_HARDWARE_BUFFER) - dev_info->currentmode = INDIO_RING_HARDWARE_BUFFER; + dev_info->currentmode = INDIO_BUFFER_TRIGGERED; + } else if (dev_info->modes & INDIO_BUFFER_HARDWARE) + dev_info->currentmode = INDIO_BUFFER_HARDWARE; else { /* should never be reached */ ret = -EINVAL; goto error_ret; @@ -519,7 +519,7 @@ ssize_t iio_show_ring_enable(struct device *dev, { struct iio_dev *dev_info = dev_get_drvdata(dev); return sprintf(buf, "%d\n", !!(dev_info->currentmode - & INDIO_ALL_RING_MODES)); + & INDIO_ALL_BUFFER_MODES)); } EXPORT_SYMBOL(iio_show_ring_enable); |