tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by

Jonathan Cameron and committed by
Greg Kroah-Hartman ec3afa40 3b99fb76

+39 -39
+1 -1
drivers/staging/iio/accel/adis16201_ring.c
··· 132 132 goto error_iio_sw_rb_free; 133 133 } 134 134 135 - indio_dev->modes |= INDIO_RING_TRIGGERED; 135 + indio_dev->modes |= INDIO_BUFFER_TRIGGERED; 136 136 return 0; 137 137 error_iio_sw_rb_free: 138 138 iio_sw_rb_free(indio_dev->ring);
+1 -1
drivers/staging/iio/accel/adis16203_ring.c
··· 134 134 goto error_iio_sw_rb_free; 135 135 } 136 136 137 - indio_dev->modes |= INDIO_RING_TRIGGERED; 137 + indio_dev->modes |= INDIO_BUFFER_TRIGGERED; 138 138 return 0; 139 139 140 140 error_iio_sw_rb_free:
+1 -1
drivers/staging/iio/accel/adis16204_ring.c
··· 130 130 goto error_iio_sw_rb_free; 131 131 } 132 132 133 - indio_dev->modes |= INDIO_RING_TRIGGERED; 133 + indio_dev->modes |= INDIO_BUFFER_TRIGGERED; 134 134 return 0; 135 135 136 136 error_iio_sw_rb_free:
+1 -1
drivers/staging/iio/accel/adis16209_ring.c
··· 130 130 goto error_iio_sw_rb_free; 131 131 } 132 132 133 - indio_dev->modes |= INDIO_RING_TRIGGERED; 133 + indio_dev->modes |= INDIO_BUFFER_TRIGGERED; 134 134 return 0; 135 135 136 136 error_iio_sw_rb_free:
+1 -1
drivers/staging/iio/accel/adis16240_ring.c
··· 127 127 goto error_iio_sw_rb_free; 128 128 } 129 129 130 - indio_dev->modes |= INDIO_RING_TRIGGERED; 130 + indio_dev->modes |= INDIO_BUFFER_TRIGGERED; 131 131 return 0; 132 132 133 133 error_iio_sw_rb_free:
+2 -2
drivers/staging/iio/accel/lis3l02dq_core.c
··· 259 259 case 0: 260 260 /* Take the iio_dev status lock */ 261 261 mutex_lock(&indio_dev->mlock); 262 - if (indio_dev->currentmode == INDIO_RING_TRIGGERED) 262 + if (indio_dev->currentmode == INDIO_BUFFER_TRIGGERED) 263 263 ret = lis3l02dq_read_accel_from_ring(indio_dev->ring, 264 264 chan->scan_index, 265 265 val); ··· 725 725 return 0; 726 726 727 727 error_remove_trigger: 728 - if (indio_dev->modes & INDIO_RING_TRIGGERED) 728 + if (indio_dev->modes & INDIO_BUFFER_TRIGGERED) 729 729 lis3l02dq_remove_trigger(indio_dev); 730 730 error_free_interrupt: 731 731 if (spi->irq && gpio_is_valid(irq_to_gpio(spi->irq)) > 0)
+1 -1
drivers/staging/iio/accel/lis3l02dq_ring.c
··· 455 455 goto error_iio_sw_rb_free; 456 456 } 457 457 458 - indio_dev->modes |= INDIO_RING_TRIGGERED; 458 + indio_dev->modes |= INDIO_BUFFER_TRIGGERED; 459 459 return 0; 460 460 461 461 error_iio_sw_rb_free:
+1 -1
drivers/staging/iio/accel/sca3000_ring.c
··· 290 290 indio_dev->ring = sca3000_rb_allocate(indio_dev); 291 291 if (indio_dev->ring == NULL) 292 292 return -ENOMEM; 293 - indio_dev->modes |= INDIO_RING_HARDWARE_BUFFER; 293 + indio_dev->modes |= INDIO_BUFFER_HARDWARE; 294 294 295 295 indio_dev->ring->access = &sca3000_ring_access_funcs; 296 296
+1 -1
drivers/staging/iio/adc/ad7192.c
··· 595 595 indio_dev->ring->setup_ops = &ad7192_ring_setup_ops; 596 596 597 597 /* Flag that polled ring buffering is possible */ 598 - indio_dev->modes |= INDIO_RING_TRIGGERED; 598 + indio_dev->modes |= INDIO_BUFFER_TRIGGERED; 599 599 return 0; 600 600 601 601 error_deallocate_sw_rb:
+1 -1
drivers/staging/iio/adc/ad7298_ring.c
··· 178 178 indio_dev->ring->scan_timestamp = true; 179 179 180 180 /* Flag that polled ring buffering is possible */ 181 - indio_dev->modes |= INDIO_RING_TRIGGERED; 181 + indio_dev->modes |= INDIO_BUFFER_TRIGGERED; 182 182 return 0; 183 183 184 184 error_deallocate_sw_rb:
+1 -1
drivers/staging/iio/adc/ad7476_ring.c
··· 141 141 indio_dev->ring->scan_timestamp = true; 142 142 143 143 /* Flag that polled ring buffering is possible */ 144 - indio_dev->modes |= INDIO_RING_TRIGGERED; 144 + indio_dev->modes |= INDIO_BUFFER_TRIGGERED; 145 145 return 0; 146 146 147 147 error_deallocate_sw_rb:
+1 -1
drivers/staging/iio/adc/ad7606_ring.c
··· 186 186 INIT_WORK(&st->poll_work, &ad7606_poll_bh_to_ring); 187 187 188 188 /* Flag that polled ring buffering is possible */ 189 - indio_dev->modes |= INDIO_RING_TRIGGERED; 189 + indio_dev->modes |= INDIO_BUFFER_TRIGGERED; 190 190 return 0; 191 191 192 192 error_deallocate_sw_rb:
+1 -1
drivers/staging/iio/adc/ad7793.c
··· 461 461 indio_dev->ring->setup_ops = &ad7793_ring_setup_ops; 462 462 463 463 /* Flag that polled ring buffering is possible */ 464 - indio_dev->modes |= INDIO_RING_TRIGGERED; 464 + indio_dev->modes |= INDIO_BUFFER_TRIGGERED; 465 465 return 0; 466 466 467 467 error_deallocate_sw_rb:
+1 -1
drivers/staging/iio/adc/ad7887_ring.c
··· 179 179 indio_dev->ring->setup_ops = &ad7887_ring_setup_ops; 180 180 181 181 /* Flag that polled ring buffering is possible */ 182 - indio_dev->modes |= INDIO_RING_TRIGGERED; 182 + indio_dev->modes |= INDIO_BUFFER_TRIGGERED; 183 183 return 0; 184 184 185 185 error_deallocate_sw_rb:
+1 -1
drivers/staging/iio/adc/ad799x_ring.c
··· 187 187 indio_dev->ring->scan_timestamp = true; 188 188 189 189 /* Flag that polled ring buffering is possible */ 190 - indio_dev->modes |= INDIO_RING_TRIGGERED; 190 + indio_dev->modes |= INDIO_BUFFER_TRIGGERED; 191 191 return 0; 192 192 193 193 error_deallocate_sw_rb:
+1 -1
drivers/staging/iio/adc/max1363_ring.c
··· 182 182 indio_dev->ring->setup_ops = &max1363_ring_setup_ops; 183 183 184 184 /* Flag that polled ring buffering is possible */ 185 - indio_dev->modes |= INDIO_RING_TRIGGERED; 185 + indio_dev->modes |= INDIO_BUFFER_TRIGGERED; 186 186 187 187 return 0; 188 188
+1 -1
drivers/staging/iio/gyro/adis16260_ring.c
··· 131 131 goto error_iio_sw_rb_free; 132 132 } 133 133 134 - indio_dev->modes |= INDIO_RING_TRIGGERED; 134 + indio_dev->modes |= INDIO_BUFFER_TRIGGERED; 135 135 return 0; 136 136 137 137 error_iio_sw_rb_free:
+5 -5
drivers/staging/iio/iio.h
··· 189 189 190 190 /* Device operating modes */ 191 191 #define INDIO_DIRECT_MODE 0x01 192 - #define INDIO_RING_TRIGGERED 0x02 193 - #define INDIO_RING_HARDWARE_BUFFER 0x08 192 + #define INDIO_BUFFER_TRIGGERED 0x02 193 + #define INDIO_BUFFER_HARDWARE 0x08 194 194 195 - #define INDIO_ALL_RING_MODES (INDIO_RING_TRIGGERED | INDIO_RING_HARDWARE_BUFFER) 195 + #define INDIO_ALL_BUFFER_MODES \ 196 + (INDIO_BUFFER_TRIGGERED | INDIO_BUFFER_HARDWARE) 196 197 197 198 /* Vast majority of this is set by the industrialio subsystem on a 198 199 * call to iio_device_register. */ ··· 389 388 static inline bool iio_ring_enabled(struct iio_dev *dev_info) 390 389 { 391 390 return dev_info->currentmode 392 - & (INDIO_RING_TRIGGERED 393 - | INDIO_RING_HARDWARE_BUFFER); 391 + & (INDIO_BUFFER_TRIGGERED | INDIO_BUFFER_HARDWARE); 394 392 }; 395 393 396 394 #endif /* _INDUSTRIAL_IO_H_ */
+1 -1
drivers/staging/iio/impedance-analyzer/ad5933.c
··· 612 612 /* Ring buffer functions - here trigger setup related */ 613 613 indio_dev->ring->setup_ops = &ad5933_ring_setup_ops; 614 614 615 - indio_dev->modes |= INDIO_RING_HARDWARE_BUFFER; 615 + indio_dev->modes |= INDIO_BUFFER_HARDWARE; 616 616 617 617 return 0; 618 618 }
+1 -1
drivers/staging/iio/imu/adis16400_core.c
··· 1070 1070 return 0; 1071 1071 1072 1072 error_remove_trigger: 1073 - if (indio_dev->modes & INDIO_RING_TRIGGERED) 1073 + if (indio_dev->modes & INDIO_BUFFER_TRIGGERED) 1074 1074 adis16400_remove_trigger(indio_dev); 1075 1075 error_uninitialize_ring: 1076 1076 iio_ring_buffer_unregister(indio_dev);
+1 -1
drivers/staging/iio/imu/adis16400_ring.c
··· 203 203 goto error_iio_sw_rb_free; 204 204 } 205 205 206 - indio_dev->modes |= INDIO_RING_TRIGGERED; 206 + indio_dev->modes |= INDIO_BUFFER_TRIGGERED; 207 207 return 0; 208 208 error_iio_sw_rb_free: 209 209 iio_sw_rb_free(indio_dev->ring);
+2 -2
drivers/staging/iio/industrialio-core.c
··· 998 998 { 999 999 struct iio_dev *dev_info = container_of(device, struct iio_dev, dev); 1000 1000 cdev_del(&dev_info->chrdev); 1001 - if (dev_info->modes & INDIO_RING_TRIGGERED) 1001 + if (dev_info->modes & INDIO_BUFFER_TRIGGERED) 1002 1002 iio_device_unregister_trigger_consumer(dev_info); 1003 1003 iio_device_unregister_eventset(dev_info); 1004 1004 iio_device_unregister_sysfs(dev_info); ··· 1126 1126 "Failed to register event set\n"); 1127 1127 goto error_free_sysfs; 1128 1128 } 1129 - if (dev_info->modes & INDIO_RING_TRIGGERED) 1129 + if (dev_info->modes & INDIO_BUFFER_TRIGGERED) 1130 1130 iio_device_register_trigger_consumer(dev_info); 1131 1131 1132 1132 ret = device_add(&dev_info->dev);
+8 -8
drivers/staging/iio/industrialio-ring.c
··· 150 150 151 151 state = !(buf[0] == '0'); 152 152 mutex_lock(&indio_dev->mlock); 153 - if (indio_dev->currentmode == INDIO_RING_TRIGGERED) { 153 + if (indio_dev->currentmode == INDIO_BUFFER_TRIGGERED) { 154 154 ret = -EBUSY; 155 155 goto error_ret; 156 156 } ··· 193 193 194 194 state = !(buf[0] == '0'); 195 195 mutex_lock(&indio_dev->mlock); 196 - if (indio_dev->currentmode == INDIO_RING_TRIGGERED) { 196 + if (indio_dev->currentmode == INDIO_BUFFER_TRIGGERED) { 197 197 ret = -EBUSY; 198 198 goto error_ret; 199 199 } ··· 430 430 mutex_lock(&dev_info->mlock); 431 431 previous_mode = dev_info->currentmode; 432 432 requested_state = !(buf[0] == '0'); 433 - current_state = !!(previous_mode & INDIO_ALL_RING_MODES); 433 + current_state = !!(previous_mode & INDIO_ALL_BUFFER_MODES); 434 434 if (current_state == requested_state) { 435 435 printk(KERN_INFO "iio-ring, current state requested again\n"); 436 436 goto done; ··· 457 457 if (ring->access->mark_in_use) 458 458 ring->access->mark_in_use(ring); 459 459 /* Definitely possible for devices to support both of these.*/ 460 - if (dev_info->modes & INDIO_RING_TRIGGERED) { 460 + if (dev_info->modes & INDIO_BUFFER_TRIGGERED) { 461 461 if (!dev_info->trig) { 462 462 printk(KERN_INFO 463 463 "Buffer not started: no trigger\n"); ··· 466 466 ring->access->unmark_in_use(ring); 467 467 goto error_ret; 468 468 } 469 - dev_info->currentmode = INDIO_RING_TRIGGERED; 470 - } else if (dev_info->modes & INDIO_RING_HARDWARE_BUFFER) 471 - dev_info->currentmode = INDIO_RING_HARDWARE_BUFFER; 469 + dev_info->currentmode = INDIO_BUFFER_TRIGGERED; 470 + } else if (dev_info->modes & INDIO_BUFFER_HARDWARE) 471 + dev_info->currentmode = INDIO_BUFFER_HARDWARE; 472 472 else { /* should never be reached */ 473 473 ret = -EINVAL; 474 474 goto error_ret; ··· 519 519 { 520 520 struct iio_dev *dev_info = dev_get_drvdata(dev); 521 521 return sprintf(buf, "%d\n", !!(dev_info->currentmode 522 - & INDIO_ALL_RING_MODES)); 522 + & INDIO_ALL_BUFFER_MODES)); 523 523 } 524 524 EXPORT_SYMBOL(iio_show_ring_enable); 525 525
+1 -1
drivers/staging/iio/industrialio-trigger.c
··· 329 329 int ret; 330 330 331 331 mutex_lock(&dev_info->mlock); 332 - if (dev_info->currentmode == INDIO_RING_TRIGGERED) { 332 + if (dev_info->currentmode == INDIO_BUFFER_TRIGGERED) { 333 333 mutex_unlock(&dev_info->mlock); 334 334 return -EBUSY; 335 335 }
+1 -1
drivers/staging/iio/meter/ade7758_core.c
··· 801 801 return 0; 802 802 803 803 error_remove_trigger: 804 - if (indio_dev->modes & INDIO_RING_TRIGGERED) 804 + if (indio_dev->modes & INDIO_BUFFER_TRIGGERED) 805 805 ade7758_remove_trigger(indio_dev); 806 806 error_uninitialize_ring: 807 807 ade7758_uninitialize_ring(indio_dev);
+1 -1
drivers/staging/iio/meter/ade7758_ring.c
··· 158 158 goto error_iio_sw_rb_free; 159 159 } 160 160 161 - indio_dev->modes |= INDIO_RING_TRIGGERED; 161 + indio_dev->modes |= INDIO_BUFFER_TRIGGERED; 162 162 163 163 st->tx_buf[0] = ADE7758_READ_REG(ADE7758_RSTATUS); 164 164 st->tx_buf[1] = 0;