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

iio: core: Simplify the registration of kfifo buffers

Among all the users of the kfifo buffers, no one uses the
INDIO_BUFFER_HARDWARE mode. So let's take this as a general rule and
simplify a little bit the internals - overall the documentation - by
eliminating unused specific cases. Use the INDIO_BUFFER_SOFTWARE mode by
default with kfifo buffers, which will basically mimic what all the "non
direct" modes do.

Cc: Benson Leung <bleung@chromium.org>
Cc: Guenter Roeck <groeck@chromium.org>
Cc: Jyoti Bhayana <jbhayana@google.com>
Cc: Jean-Baptiste Maneyrol <jmaneyrol@invensense.com>
Cc: Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>
Cc: Michael Hennerich <Michael.Hennerich@analog.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/r/20220207143840.707510-13-miquel.raynal@bootlin.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

authored by

Miquel Raynal and committed by
Jonathan Cameron
f67c6c73 51570c9d

+5 -31
-1
drivers/iio/accel/adxl367.c
··· 1567 1567 return ret; 1568 1568 1569 1569 ret = devm_iio_kfifo_buffer_setup_ext(st->dev, indio_dev, 1570 - INDIO_BUFFER_SOFTWARE, 1571 1570 &adxl367_buffer_ops, 1572 1571 adxl367_fifo_attributes); 1573 1572 if (ret)
-1
drivers/iio/accel/fxls8962af-core.c
··· 1217 1217 return ret; 1218 1218 1219 1219 ret = devm_iio_kfifo_buffer_setup(dev, indio_dev, 1220 - INDIO_BUFFER_SOFTWARE, 1221 1220 &fxls8962af_buffer_ops); 1222 1221 if (ret) 1223 1222 return ret;
-1
drivers/iio/accel/sca3000.c
··· 1474 1474 indio_dev->modes = INDIO_DIRECT_MODE; 1475 1475 1476 1476 ret = devm_iio_kfifo_buffer_setup(&spi->dev, indio_dev, 1477 - INDIO_BUFFER_SOFTWARE, 1478 1477 &sca3000_ring_setup_ops); 1479 1478 if (ret) 1480 1479 return ret;
-1
drivers/iio/accel/ssp_accel_sensor.c
··· 113 113 indio_dev->available_scan_masks = ssp_accel_scan_mask; 114 114 115 115 ret = devm_iio_kfifo_buffer_setup(&pdev->dev, indio_dev, 116 - INDIO_BUFFER_SOFTWARE, 117 116 &ssp_accel_buffer_ops); 118 117 if (ret) 119 118 return ret;
-1
drivers/iio/adc/ina2xx-adc.c
··· 1027 1027 indio_dev->name = id->name; 1028 1028 1029 1029 ret = devm_iio_kfifo_buffer_setup(&client->dev, indio_dev, 1030 - INDIO_BUFFER_SOFTWARE, 1031 1030 &ina2xx_setup_ops); 1032 1031 if (ret) 1033 1032 return ret;
+1 -3
drivers/iio/adc/ti_am335x_adc.c
··· 376 376 { 377 377 int ret; 378 378 379 - ret = devm_iio_kfifo_buffer_setup(dev, indio_dev, 380 - INDIO_BUFFER_SOFTWARE, 381 - setup_ops); 379 + ret = devm_iio_kfifo_buffer_setup(dev, indio_dev, setup_ops); 382 380 if (ret) 383 381 return ret; 384 382
+1 -9
drivers/iio/buffer/kfifo_buf.c
··· 259 259 * devm_iio_kfifo_buffer_setup_ext - Allocate a kfifo buffer & attach it to an IIO device 260 260 * @dev: Device object to which to attach the life-time of this kfifo buffer 261 261 * @indio_dev: The device the buffer should be attached to 262 - * @mode_flags: The mode flags for this buffer (INDIO_BUFFER_SOFTWARE and/or 263 - * INDIO_BUFFER_TRIGGERED). 264 262 * @setup_ops: The setup_ops required to configure the HW part of the buffer (optional) 265 263 * @buffer_attrs: Extra sysfs buffer attributes for this IIO buffer 266 264 * ··· 269 271 */ 270 272 int devm_iio_kfifo_buffer_setup_ext(struct device *dev, 271 273 struct iio_dev *indio_dev, 272 - int mode_flags, 273 274 const struct iio_buffer_setup_ops *setup_ops, 274 275 const struct attribute **buffer_attrs) 275 276 { 276 277 struct iio_buffer *buffer; 277 278 278 - if (!mode_flags) 279 - return -EINVAL; 280 - 281 279 buffer = devm_iio_kfifo_allocate(dev); 282 280 if (!buffer) 283 281 return -ENOMEM; 284 282 285 - mode_flags &= kfifo_access_funcs.modes; 286 - 287 - indio_dev->modes |= mode_flags; 283 + indio_dev->modes |= INDIO_BUFFER_SOFTWARE; 288 284 indio_dev->setup_ops = setup_ops; 289 285 290 286 buffer->attrs = buffer_attrs;
+1 -2
drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c
··· 333 333 * We can not use trigger here, as events are generated 334 334 * as soon as sample_frequency is set. 335 335 */ 336 - ret = devm_iio_kfifo_buffer_setup_ext(dev, indio_dev, 337 - INDIO_BUFFER_SOFTWARE, NULL, 336 + ret = devm_iio_kfifo_buffer_setup_ext(dev, indio_dev, NULL, 338 337 cros_ec_sensor_fifo_attributes); 339 338 if (ret) 340 339 return ret;
-1
drivers/iio/common/scmi_sensors/scmi_iio.c
··· 686 686 687 687 err = devm_iio_kfifo_buffer_setup(&scmi_iio_dev->dev, 688 688 scmi_iio_dev, 689 - INDIO_BUFFER_SOFTWARE, 690 689 &scmi_iio_buffer_ops); 691 690 if (err < 0) { 692 691 dev_err(dev,
-1
drivers/iio/gyro/ssp_gyro_sensor.c
··· 113 113 indio_dev->available_scan_masks = ssp_gyro_scan_mask; 114 114 115 115 ret = devm_iio_kfifo_buffer_setup(&pdev->dev, indio_dev, 116 - INDIO_BUFFER_SOFTWARE, 117 116 &ssp_gyro_buffer_ops); 118 117 if (ret) 119 118 return ret;
-1
drivers/iio/health/max30100.c
··· 433 433 indio_dev->modes = INDIO_DIRECT_MODE; 434 434 435 435 ret = devm_iio_kfifo_buffer_setup(&client->dev, indio_dev, 436 - INDIO_BUFFER_SOFTWARE, 437 436 &max30100_buffer_setup_ops); 438 437 if (ret) 439 438 return ret;
-1
drivers/iio/health/max30102.c
··· 542 542 } 543 543 544 544 ret = devm_iio_kfifo_buffer_setup(&client->dev, indio_dev, 545 - INDIO_BUFFER_SOFTWARE, 546 545 &max30102_buffer_setup_ops); 547 546 if (ret) 548 547 return ret;
-1
drivers/iio/imu/inv_icm42600/inv_icm42600_accel.c
··· 731 731 indio_dev->available_scan_masks = inv_icm42600_accel_scan_masks; 732 732 733 733 ret = devm_iio_kfifo_buffer_setup(dev, indio_dev, 734 - INDIO_BUFFER_SOFTWARE, 735 734 &inv_icm42600_buffer_ops); 736 735 if (ret) 737 736 return ERR_PTR(ret);
-1
drivers/iio/imu/inv_icm42600/inv_icm42600_gyro.c
··· 743 743 indio_dev->setup_ops = &inv_icm42600_buffer_ops; 744 744 745 745 ret = devm_iio_kfifo_buffer_setup(dev, indio_dev, 746 - INDIO_BUFFER_SOFTWARE, 747 746 &inv_icm42600_buffer_ops); 748 747 if (ret) 749 748 return ERR_PTR(ret);
-1
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c
··· 746 746 continue; 747 747 748 748 ret = devm_iio_kfifo_buffer_setup(hw->dev, hw->iio_devs[i], 749 - INDIO_BUFFER_SOFTWARE, 750 749 &st_lsm6dsx_buffer_ops); 751 750 if (ret) 752 751 return ret;
-1
drivers/iio/light/apds9960.c
··· 1003 1003 indio_dev->modes = INDIO_DIRECT_MODE; 1004 1004 1005 1005 ret = devm_iio_kfifo_buffer_setup(&client->dev, indio_dev, 1006 - INDIO_BUFFER_SOFTWARE, 1007 1006 &apds9960_buffer_setup_ops); 1008 1007 if (ret) 1009 1008 return ret;
-1
drivers/staging/iio/impedance-analyzer/ad5933.c
··· 749 749 indio_dev->num_channels = ARRAY_SIZE(ad5933_channels); 750 750 751 751 ret = devm_iio_kfifo_buffer_setup(&client->dev, indio_dev, 752 - INDIO_BUFFER_SOFTWARE, 753 752 &ad5933_ring_setup_ops); 754 753 if (ret) 755 754 return ret;
+2 -3
include/linux/iio/kfifo_buf.h
··· 12 12 13 13 int devm_iio_kfifo_buffer_setup_ext(struct device *dev, 14 14 struct iio_dev *indio_dev, 15 - int mode_flags, 16 15 const struct iio_buffer_setup_ops *setup_ops, 17 16 const struct attribute **buffer_attrs); 18 17 19 - #define devm_iio_kfifo_buffer_setup(dev, indio_dev, mode_flags, setup_ops) \ 20 - devm_iio_kfifo_buffer_setup_ext((dev), (indio_dev), (mode_flags), (setup_ops), NULL) 18 + #define devm_iio_kfifo_buffer_setup(dev, indio_dev, setup_ops) \ 19 + devm_iio_kfifo_buffer_setup_ext((dev), (indio_dev), (setup_ops), NULL) 21 20 22 21 #endif