evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging:iio:buffering cleanup ring_buffer_register_ex naming.

Browse source 
Now the old method is long gone, lets get rid of the _ex and whilst
here remove the unused id parameter.

Trivial mechanical change, but will break any out of tree drivers
using this.

V2: rebase
V3: rebase

Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Jonathan Cameron 2011-08-30 12:41:14 +01:00 • committed by Greg Kroah-Hartman
parent 6446e9cd2c
commit c009f7e426
21 changed files with 66 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/staging/iio/accel/adis16201_core.c
View file

@ -497,7 +497,7 @@ static int __devinit adis16201_probe(struct spi_device *spi)
goto error_unreg_ring_funcs; goto error_unreg_ring_funcs;
regdone = 1; regdone = 1;
ret = iio_ring_buffer_register_ex(indio_dev, 0, ret = iio_ring_buffer_register(indio_dev,
adis16201_channels, adis16201_channels,
ARRAY_SIZE(adis16201_channels)); ARRAY_SIZE(adis16201_channels));
if (ret) { if (ret) {

2
drivers/staging/iio/accel/adis16203_core.c
View file

@ -451,7 +451,7 @@ static int __devinit adis16203_probe(struct spi_device *spi)
goto error_unreg_ring_funcs; goto error_unreg_ring_funcs;
regdone = 1; regdone = 1;
ret = iio_ring_buffer_register_ex(indio_dev, 0, ret = iio_ring_buffer_register(indio_dev,
adis16203_channels, adis16203_channels,
ARRAY_SIZE(adis16203_channels)); ARRAY_SIZE(adis16203_channels));
if (ret) { if (ret) {

2
drivers/staging/iio/accel/adis16204_core.c
View file

@ -526,7 +526,7 @@ static int __devinit adis16204_probe(struct spi_device *spi)
goto error_unreg_ring_funcs; goto error_unreg_ring_funcs;
regdone = 1; regdone = 1;
ret = iio_ring_buffer_register_ex(indio_dev, 0, ret = iio_ring_buffer_register(indio_dev,
adis16204_channels, adis16204_channels,
ARRAY_SIZE(adis16204_channels)); ARRAY_SIZE(adis16204_channels));
if (ret) { if (ret) {

2
drivers/staging/iio/accel/adis16209_core.c
View file

@ -499,7 +499,7 @@ static int __devinit adis16209_probe(struct spi_device *spi)
goto error_unreg_ring_funcs; goto error_unreg_ring_funcs;
regdone = 1; regdone = 1;
ret = iio_ring_buffer_register_ex(indio_dev, 0, ret = iio_ring_buffer_register(indio_dev,
adis16209_channels, adis16209_channels,
ARRAY_SIZE(adis16209_channels)); ARRAY_SIZE(adis16209_channels));
if (ret) { if (ret) {

2
drivers/staging/iio/accel/adis16240_core.c
View file

@ -552,7 +552,7 @@ static int __devinit adis16240_probe(struct spi_device *spi)
goto error_unreg_ring_funcs; goto error_unreg_ring_funcs;
regdone = 1; regdone = 1;
ret = iio_ring_buffer_register_ex(indio_dev, 0, ret = iio_ring_buffer_register(indio_dev,
adis16240_channels, adis16240_channels,
ARRAY_SIZE(adis16240_channels)); ARRAY_SIZE(adis16240_channels));
if (ret) { if (ret) {

2
drivers/staging/iio/accel/lis3l02dq_core.c
View file

@ -695,7 +695,7 @@ static int __devinit lis3l02dq_probe(struct spi_device *spi)
goto error_unreg_ring_funcs; goto error_unreg_ring_funcs;
regdone = 1; regdone = 1;
ret = iio_ring_buffer_register_ex(indio_dev, 0, ret = iio_ring_buffer_register(indio_dev,
lis3l02dq_channels, lis3l02dq_channels,
ARRAY_SIZE(lis3l02dq_channels)); ARRAY_SIZE(lis3l02dq_channels));
if (ret) { if (ret) {

2
drivers/staging/iio/accel/sca3000_core.c
View file

@ -1156,7 +1156,7 @@ static int __devinit sca3000_probe(struct spi_device *spi)
if (ret < 0) if (ret < 0)
goto error_free_dev; goto error_free_dev;
regdone = 1; regdone = 1;
ret = iio_ring_buffer_register_ex(indio_dev, 0, ret = iio_ring_buffer_register(indio_dev,
sca3000_channels, sca3000_channels,
ARRAY_SIZE(sca3000_channels)); ARRAY_SIZE(sca3000_channels));
if (ret < 0) if (ret < 0)

2
drivers/staging/iio/adc/ad7192.c
View file

@ -1098,7 +1098,7 @@ static int __devinit ad7192_probe(struct spi_device *spi)
if (ret) if (ret)
goto error_unreg_ring; goto error_unreg_ring;
ret = iio_ring_buffer_register_ex(indio_dev, 0, ret = iio_ring_buffer_register(indio_dev,
indio_dev->channels, indio_dev->channels,
indio_dev->num_channels); indio_dev->num_channels);
if (ret) if (ret)

2
drivers/staging/iio/adc/ad7298_core.c
View file

@ -223,7 +223,7 @@ static int __devinit ad7298_probe(struct spi_device *spi)
goto error_disable_reg; goto error_disable_reg;
regdone = 1; regdone = 1;
ret = iio_ring_buffer_register_ex(indio_dev, 0, ret = iio_ring_buffer_register(indio_dev,
&ad7298_channels[1], /* skip temp0 */ &ad7298_channels[1], /* skip temp0 */
ARRAY_SIZE(ad7298_channels) - 1); ARRAY_SIZE(ad7298_channels) - 1);
if (ret) if (ret)

2
drivers/staging/iio/adc/ad7476_core.c
View file

@ -186,7 +186,7 @@ static int __devinit ad7476_probe(struct spi_device *spi)
if (ret) if (ret)
goto error_disable_reg; goto error_disable_reg;
ret = iio_ring_buffer_register_ex(indio_dev, 0, ret = iio_ring_buffer_register(indio_dev,
st->chip_info->channel, st->chip_info->channel,
ARRAY_SIZE(st->chip_info->channel)); ARRAY_SIZE(st->chip_info->channel));
if (ret) if (ret)

2
drivers/staging/iio/adc/ad7606_core.c
View file

@ -506,7 +506,7 @@ struct iio_dev *ad7606_probe(struct device *dev, int irq,
goto error_free_irq; goto error_free_irq;
regdone = 1; regdone = 1;
ret = iio_ring_buffer_register_ex(indio_dev, 0, ret = iio_ring_buffer_register(indio_dev,
indio_dev->channels, indio_dev->channels,
indio_dev->num_channels); indio_dev->num_channels);
if (ret) if (ret)

2
drivers/staging/iio/adc/ad7793.c
View file

@ -895,7 +895,7 @@ static int __devinit ad7793_probe(struct spi_device *spi)
if (ret) if (ret)
goto error_unreg_ring; goto error_unreg_ring;
ret = iio_ring_buffer_register_ex(indio_dev, 0, ret = iio_ring_buffer_register(indio_dev,
indio_dev->channels, indio_dev->channels,
indio_dev->num_channels); indio_dev->num_channels);
if (ret) if (ret)

2
drivers/staging/iio/adc/ad7887_core.c
View file

@ -194,7 +194,7 @@ static int __devinit ad7887_probe(struct spi_device *spi)
goto error_disable_reg; goto error_disable_reg;
regdone = 1; regdone = 1;
ret = iio_ring_buffer_register_ex(indio_dev, 0, ret = iio_ring_buffer_register(indio_dev,
indio_dev->channels, indio_dev->channels,
indio_dev->num_channels); indio_dev->num_channels);
if (ret) if (ret)

2
drivers/staging/iio/adc/ad799x_core.c
View file

@ -706,7 +706,7 @@ static int __devinit ad799x_probe(struct i2c_client *client,
goto error_cleanup_ring; goto error_cleanup_ring;
regdone = 1; regdone = 1;
ret = iio_ring_buffer_register_ex(indio_dev, 0, ret = iio_ring_buffer_register(indio_dev,
indio_dev->channels, indio_dev->channels,
indio_dev->num_channels); indio_dev->num_channels);
if (ret) if (ret)

2
drivers/staging/iio/adc/max1363_core.c
View file

@ -1313,7 +1313,7 @@ static int __devinit max1363_probe(struct i2c_client *client,
if (ret) if (ret)
goto error_cleanup_ring; goto error_cleanup_ring;
regdone = 1; regdone = 1;
ret = iio_ring_buffer_register_ex(indio_dev, 0, ret = iio_ring_buffer_register(indio_dev,
st->chip_info->channels, st->chip_info->channels,
st->chip_info->num_channels); st->chip_info->num_channels);
if (ret) if (ret)

2
drivers/staging/iio/gyro/adis16260_core.c
View file

@ -629,7 +629,7 @@ static int __devinit adis16260_probe(struct spi_device *spi)
if (ret) if (ret)
goto error_unreg_ring_funcs; goto error_unreg_ring_funcs;
regdone = 1; regdone = 1;
ret = iio_ring_buffer_register_ex(indio_dev, 0, ret = iio_ring_buffer_register(indio_dev,
indio_dev->channels, indio_dev->channels,
ARRAY_SIZE(adis16260_channels_x)); ARRAY_SIZE(adis16260_channels_x));
if (ret) { if (ret) {

2
drivers/staging/iio/impedance-analyzer/ad5933.c
View file

@ -733,7 +733,7 @@ static int __devinit ad5933_probe(struct i2c_client *client,
regdone = 1; regdone = 1;
/* skip temp0_input, register in0_(real|imag)_raw */ /* skip temp0_input, register in0_(real|imag)_raw */
ret = iio_ring_buffer_register_ex(indio_dev, 0, &ad5933_channels[1], 2); ret = iio_ring_buffer_register(indio_dev, &ad5933_channels[1], 2);
if (ret) if (ret)
goto error_unreg_ring; goto error_unreg_ring;

2
drivers/staging/iio/imu/adis16400_core.c
View file

@ -853,7 +853,7 @@ static int __devinit adis16400_probe(struct spi_device *spi)
goto error_unreg_ring_funcs; goto error_unreg_ring_funcs;
regdone = 1; regdone = 1;
ret = iio_ring_buffer_register_ex(indio_dev, 0, ret = iio_ring_buffer_register(indio_dev,
st->variant->channels, st->variant->channels,
st->variant->num_channels); st->variant->num_channels);
if (ret) { if (ret) {

4
drivers/staging/iio/industrialio-ring.c
View file

@ -277,7 +277,7 @@ static void __iio_ring_attr_cleanup(struct iio_dev *indio_dev)
&iio_scan_el_dummy_group); &iio_scan_el_dummy_group);
} }
int iio_ring_buffer_register_ex(struct iio_dev *indio_dev, int id, int iio_ring_buffer_register(struct iio_dev *indio_dev,
const struct iio_chan_spec *channels, const struct iio_chan_spec *channels,
int num_channels) int num_channels)
{ {
@ -325,7 +325,7 @@ error_cleanup_dynamic:
error_ret: error_ret:
return ret; return ret;
} }
EXPORT_SYMBOL(iio_ring_buffer_register_ex); EXPORT_SYMBOL(iio_ring_buffer_register);
void iio_ring_buffer_unregister(struct iio_dev *indio_dev) void iio_ring_buffer_unregister(struct iio_dev *indio_dev)
{ {

2
drivers/staging/iio/meter/ade7758_core.c
View file

@ -780,7 +780,7 @@ static int __devinit ade7758_probe(struct spi_device *spi)
goto error_unreg_ring_funcs; goto error_unreg_ring_funcs;
regdone = 1; regdone = 1;
ret = iio_ring_buffer_register_ex(indio_dev, 0, ret = iio_ring_buffer_register(indio_dev,
&ade7758_channels[0], &ade7758_channels[0],
ARRAY_SIZE(ade7758_channels)); ARRAY_SIZE(ade7758_channels));
if (ret) { if (ret) {

8
drivers/staging/iio/ring_generic.h
View file

@ -206,11 +206,10 @@ static inline int iio_scan_mask_set(struct iio_ring_buffer *ring, int bit)
container_of(d, struct iio_ring_buffer, dev) container_of(d, struct iio_ring_buffer, dev)
/** /**
* iio_ring_buffer_register_ex() - register the buffer with IIO core * iio_ring_buffer_register() - register the buffer with IIO core
* @indio_dev: device with the buffer to be registered * @indio_dev: device with the buffer to be registered
* @id: the id of the buffer (typically 0)
**/ **/
int iio_ring_buffer_register_ex(struct iio_dev *indio_dev, int id, int iio_ring_buffer_register(struct iio_dev *indio_dev,
const struct iio_chan_spec *channels, const struct iio_chan_spec *channels,
int num_channels); int num_channels);
@ -265,8 +264,7 @@ int iio_sw_ring_preenable(struct iio_dev *indio_dev);
#else /* CONFIG_IIO_RING_BUFFER */ #else /* CONFIG_IIO_RING_BUFFER */
static inline int iio_ring_buffer_register_ex(struct iio_dev *indio_dev, static inline int iio_ring_buffer_register(struct iio_dev *indio_dev,
int id,
struct iio_chan_spec *channels, struct iio_chan_spec *channels,
int num_channels) int num_channels)
{ {