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

staging:iio:impedance-analyzer switch from sw_ring to kfifo.

sw_ring buffer implementation is going away so switch to the
kfifo based alternative.

Signed-off-by: Jonathan Cameron <jic23@kernel.org>

+5 -5
+1 -1
drivers/staging/iio/impedance-analyzer/Kconfig
··· 7 7 tristate "Analog Devices AD5933, AD5934 driver" 8 8 depends on I2C 9 9 select IIO_BUFFER 10 - select IIO_SW_RING 10 + select IIO_KFIFO_BUF 11 11 help 12 12 Say yes here to build support for Analog Devices Impedance Converter, 13 13 Network Analyzer, AD5933/4, provides direct access via sysfs.
+4 -4
drivers/staging/iio/impedance-analyzer/ad5933.c
··· 22 22 #include <linux/iio/iio.h> 23 23 #include <linux/iio/sysfs.h> 24 24 #include <linux/iio/buffer.h> 25 - #include "../ring_sw.h" 25 + #include <linux/iio/kfifo_buf.h> 26 26 27 27 #include "ad5933.h" 28 28 ··· 630 630 631 631 static int ad5933_register_ring_funcs_and_init(struct iio_dev *indio_dev) 632 632 { 633 - indio_dev->buffer = iio_sw_rb_allocate(indio_dev); 633 + indio_dev->buffer = iio_kfifo_allocate(indio_dev); 634 634 if (!indio_dev->buffer) 635 635 return -ENOMEM; 636 636 ··· 774 774 error_uninitialize_ring: 775 775 iio_buffer_unregister(indio_dev); 776 776 error_unreg_ring: 777 - iio_sw_rb_free(indio_dev->buffer); 777 + iio_kfifo_free(indio_dev->buffer); 778 778 error_disable_reg: 779 779 if (!IS_ERR(st->reg)) 780 780 regulator_disable(st->reg); ··· 794 794 795 795 iio_device_unregister(indio_dev); 796 796 iio_buffer_unregister(indio_dev); 797 - iio_sw_rb_free(indio_dev->buffer); 797 + iio_kfifo_free(indio_dev->buffer); 798 798 if (!IS_ERR(st->reg)) { 799 799 regulator_disable(st->reg); 800 800 regulator_put(st->reg);