staging:iio: treewide rename iio_triggered_ring_* to iio_triggered_buffer_*
Not always a ring so naming is missleading. Also, kfifo_buf is probably first buffer to take out of staging and it definitely isn't a ring. Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Родитель
0baf29d658
Коммит
3b99fb7656
|
@ -99,8 +99,8 @@ void adis16201_unconfigure_ring(struct iio_dev *indio_dev)
|
|||
|
||||
static const struct iio_ring_setup_ops adis16201_ring_setup_ops = {
|
||||
.preenable = &iio_sw_ring_preenable,
|
||||
.postenable = &iio_triggered_ring_postenable,
|
||||
.predisable = &iio_triggered_ring_predisable,
|
||||
.postenable = &iio_triggered_buffer_postenable,
|
||||
.predisable = &iio_triggered_buffer_predisable,
|
||||
};
|
||||
|
||||
int adis16201_configure_ring(struct iio_dev *indio_dev)
|
||||
|
|
|
@ -101,8 +101,8 @@ void adis16203_unconfigure_ring(struct iio_dev *indio_dev)
|
|||
|
||||
static const struct iio_ring_setup_ops adis16203_ring_setup_ops = {
|
||||
.preenable = &iio_sw_ring_preenable,
|
||||
.postenable = &iio_triggered_ring_postenable,
|
||||
.predisable = &iio_triggered_ring_predisable,
|
||||
.postenable = &iio_triggered_buffer_postenable,
|
||||
.predisable = &iio_triggered_buffer_predisable,
|
||||
};
|
||||
|
||||
int adis16203_configure_ring(struct iio_dev *indio_dev)
|
||||
|
|
|
@ -96,8 +96,8 @@ void adis16204_unconfigure_ring(struct iio_dev *indio_dev)
|
|||
|
||||
static const struct iio_ring_setup_ops adis16204_ring_setup_ops = {
|
||||
.preenable = &iio_sw_ring_preenable,
|
||||
.postenable = &iio_triggered_ring_postenable,
|
||||
.predisable = &iio_triggered_ring_predisable,
|
||||
.postenable = &iio_triggered_buffer_postenable,
|
||||
.predisable = &iio_triggered_buffer_predisable,
|
||||
};
|
||||
|
||||
int adis16204_configure_ring(struct iio_dev *indio_dev)
|
||||
|
|
|
@ -96,8 +96,8 @@ void adis16209_unconfigure_ring(struct iio_dev *indio_dev)
|
|||
|
||||
static const struct iio_ring_setup_ops adis16209_ring_setup_ops = {
|
||||
.preenable = &iio_sw_ring_preenable,
|
||||
.postenable = &iio_triggered_ring_postenable,
|
||||
.predisable = &iio_triggered_ring_predisable,
|
||||
.postenable = &iio_triggered_buffer_postenable,
|
||||
.predisable = &iio_triggered_buffer_predisable,
|
||||
};
|
||||
|
||||
int adis16209_configure_ring(struct iio_dev *indio_dev)
|
||||
|
|
|
@ -93,8 +93,8 @@ void adis16240_unconfigure_ring(struct iio_dev *indio_dev)
|
|||
|
||||
static const struct iio_ring_setup_ops adis16240_ring_setup_ops = {
|
||||
.preenable = &iio_sw_ring_preenable,
|
||||
.postenable = &iio_triggered_ring_postenable,
|
||||
.predisable = &iio_triggered_ring_predisable,
|
||||
.postenable = &iio_triggered_buffer_postenable,
|
||||
.predisable = &iio_triggered_buffer_predisable,
|
||||
};
|
||||
|
||||
int adis16240_configure_ring(struct iio_dev *indio_dev)
|
||||
|
|
|
@ -386,7 +386,7 @@ static int lis3l02dq_ring_postenable(struct iio_dev *indio_dev)
|
|||
if (ret)
|
||||
goto error_ret;
|
||||
|
||||
return iio_triggered_ring_postenable(indio_dev);
|
||||
return iio_triggered_buffer_postenable(indio_dev);
|
||||
error_ret:
|
||||
return ret;
|
||||
}
|
||||
|
@ -397,7 +397,7 @@ static int lis3l02dq_ring_predisable(struct iio_dev *indio_dev)
|
|||
u8 t;
|
||||
int ret;
|
||||
|
||||
ret = iio_triggered_ring_predisable(indio_dev);
|
||||
ret = iio_triggered_buffer_predisable(indio_dev);
|
||||
if (ret)
|
||||
goto error_ret;
|
||||
|
||||
|
|
|
@ -564,8 +564,8 @@ static irqreturn_t ad7192_trigger_handler(int irq, void *p)
|
|||
|
||||
static const struct iio_ring_setup_ops ad7192_ring_setup_ops = {
|
||||
.preenable = &ad7192_ring_preenable,
|
||||
.postenable = &iio_triggered_ring_postenable,
|
||||
.predisable = &iio_triggered_ring_predisable,
|
||||
.postenable = &iio_triggered_buffer_postenable,
|
||||
.predisable = &iio_triggered_buffer_predisable,
|
||||
.postdisable = &ad7192_ring_postdisable,
|
||||
};
|
||||
|
||||
|
|
|
@ -145,8 +145,8 @@ static irqreturn_t ad7298_trigger_handler(int irq, void *p)
|
|||
|
||||
static const struct iio_ring_setup_ops ad7298_ring_setup_ops = {
|
||||
.preenable = &ad7298_ring_preenable,
|
||||
.postenable = &iio_triggered_ring_postenable,
|
||||
.predisable = &iio_triggered_ring_predisable,
|
||||
.postenable = &iio_triggered_buffer_postenable,
|
||||
.predisable = &iio_triggered_buffer_predisable,
|
||||
};
|
||||
|
||||
int ad7298_register_ring_funcs_and_init(struct iio_dev *indio_dev)
|
||||
|
|
|
@ -107,8 +107,8 @@ done:
|
|||
|
||||
static const struct iio_ring_setup_ops ad7476_ring_setup_ops = {
|
||||
.preenable = &ad7476_ring_preenable,
|
||||
.postenable = &iio_triggered_ring_postenable,
|
||||
.predisable = &iio_triggered_ring_predisable,
|
||||
.postenable = &iio_triggered_buffer_postenable,
|
||||
.predisable = &iio_triggered_buffer_predisable,
|
||||
};
|
||||
|
||||
int ad7476_register_ring_funcs_and_init(struct iio_dev *indio_dev)
|
||||
|
|
|
@ -149,8 +149,8 @@ done:
|
|||
|
||||
static const struct iio_ring_setup_ops ad7606_ring_setup_ops = {
|
||||
.preenable = &ad7606_ring_preenable,
|
||||
.postenable = &iio_triggered_ring_postenable,
|
||||
.predisable = &iio_triggered_ring_predisable,
|
||||
.postenable = &iio_triggered_buffer_postenable,
|
||||
.predisable = &iio_triggered_buffer_predisable,
|
||||
};
|
||||
|
||||
int ad7606_register_ring_funcs_and_init(struct iio_dev *indio_dev)
|
||||
|
|
|
@ -430,8 +430,8 @@ static irqreturn_t ad7793_trigger_handler(int irq, void *p)
|
|||
|
||||
static const struct iio_ring_setup_ops ad7793_ring_setup_ops = {
|
||||
.preenable = &ad7793_ring_preenable,
|
||||
.postenable = &iio_triggered_ring_postenable,
|
||||
.predisable = &iio_triggered_ring_predisable,
|
||||
.postenable = &iio_triggered_buffer_postenable,
|
||||
.predisable = &iio_triggered_buffer_predisable,
|
||||
.postdisable = &ad7793_ring_postdisable,
|
||||
};
|
||||
|
||||
|
|
|
@ -149,8 +149,8 @@ done:
|
|||
|
||||
static const struct iio_ring_setup_ops ad7887_ring_setup_ops = {
|
||||
.preenable = &ad7887_ring_preenable,
|
||||
.postenable = &iio_triggered_ring_postenable,
|
||||
.predisable = &iio_triggered_ring_predisable,
|
||||
.postenable = &iio_triggered_buffer_postenable,
|
||||
.predisable = &iio_triggered_buffer_predisable,
|
||||
.postdisable = &ad7887_ring_postdisable,
|
||||
};
|
||||
|
||||
|
|
|
@ -155,8 +155,8 @@ out:
|
|||
|
||||
static const struct iio_ring_setup_ops ad799x_buf_setup_ops = {
|
||||
.preenable = &ad799x_ring_preenable,
|
||||
.postenable = &iio_triggered_ring_postenable,
|
||||
.predisable = &iio_triggered_ring_predisable,
|
||||
.postenable = &iio_triggered_buffer_postenable,
|
||||
.predisable = &iio_triggered_buffer_predisable,
|
||||
};
|
||||
|
||||
int ad799x_register_ring_funcs_and_init(struct iio_dev *indio_dev)
|
||||
|
|
|
@ -150,9 +150,9 @@ done:
|
|||
}
|
||||
|
||||
static const struct iio_ring_setup_ops max1363_ring_setup_ops = {
|
||||
.postenable = &iio_triggered_ring_postenable,
|
||||
.postenable = &iio_triggered_buffer_postenable,
|
||||
.preenable = &max1363_ring_preenable,
|
||||
.predisable = &iio_triggered_ring_predisable,
|
||||
.predisable = &iio_triggered_buffer_predisable,
|
||||
};
|
||||
|
||||
int max1363_register_ring_funcs_and_init(struct iio_dev *indio_dev)
|
||||
|
|
|
@ -98,8 +98,8 @@ void adis16260_unconfigure_ring(struct iio_dev *indio_dev)
|
|||
|
||||
static const struct iio_ring_setup_ops adis16260_ring_setup_ops = {
|
||||
.preenable = &iio_sw_ring_preenable,
|
||||
.postenable = &iio_triggered_ring_postenable,
|
||||
.predisable = &iio_triggered_ring_predisable,
|
||||
.postenable = &iio_triggered_buffer_postenable,
|
||||
.predisable = &iio_triggered_buffer_predisable,
|
||||
};
|
||||
|
||||
int adis16260_configure_ring(struct iio_dev *indio_dev)
|
||||
|
|
|
@ -168,8 +168,8 @@ void adis16400_unconfigure_ring(struct iio_dev *indio_dev)
|
|||
|
||||
static const struct iio_ring_setup_ops adis16400_ring_setup_ops = {
|
||||
.preenable = &iio_sw_ring_preenable,
|
||||
.postenable = &iio_triggered_ring_postenable,
|
||||
.predisable = &iio_triggered_ring_predisable,
|
||||
.postenable = &iio_triggered_buffer_postenable,
|
||||
.predisable = &iio_triggered_buffer_predisable,
|
||||
};
|
||||
|
||||
int adis16400_configure_ring(struct iio_dev *indio_dev)
|
||||
|
|
|
@ -488,20 +488,20 @@ void iio_device_unregister_trigger_consumer(struct iio_dev *dev_info)
|
|||
iio_put_trigger(dev_info->trig);
|
||||
}
|
||||
|
||||
int iio_triggered_ring_postenable(struct iio_dev *indio_dev)
|
||||
int iio_triggered_buffer_postenable(struct iio_dev *indio_dev)
|
||||
{
|
||||
return indio_dev->trig
|
||||
? iio_trigger_attach_poll_func(indio_dev->trig,
|
||||
indio_dev->pollfunc)
|
||||
: 0;
|
||||
}
|
||||
EXPORT_SYMBOL(iio_triggered_ring_postenable);
|
||||
EXPORT_SYMBOL(iio_triggered_buffer_postenable);
|
||||
|
||||
int iio_triggered_ring_predisable(struct iio_dev *indio_dev)
|
||||
int iio_triggered_buffer_predisable(struct iio_dev *indio_dev)
|
||||
{
|
||||
return indio_dev->trig
|
||||
? iio_trigger_dettach_poll_func(indio_dev->trig,
|
||||
indio_dev->pollfunc)
|
||||
: 0;
|
||||
}
|
||||
EXPORT_SYMBOL(iio_triggered_ring_predisable);
|
||||
EXPORT_SYMBOL(iio_triggered_buffer_predisable);
|
||||
|
|
|
@ -121,8 +121,8 @@ static int ade7758_ring_preenable(struct iio_dev *indio_dev)
|
|||
|
||||
static const struct iio_ring_setup_ops ade7758_ring_setup_ops = {
|
||||
.preenable = &ade7758_ring_preenable,
|
||||
.postenable = &iio_triggered_ring_postenable,
|
||||
.predisable = &iio_triggered_ring_predisable,
|
||||
.postenable = &iio_triggered_buffer_postenable,
|
||||
.predisable = &iio_triggered_buffer_predisable,
|
||||
};
|
||||
|
||||
void ade7758_unconfigure_ring(struct iio_dev *indio_dev)
|
||||
|
|
|
@ -48,5 +48,5 @@ void iio_trigger_notify_done(struct iio_trigger *trig);
|
|||
* Two functions for common case where all that happens is a pollfunc
|
||||
* is attached and detached from a trigger
|
||||
*/
|
||||
int iio_triggered_ring_postenable(struct iio_dev *indio_dev);
|
||||
int iio_triggered_ring_predisable(struct iio_dev *indio_dev);
|
||||
int iio_triggered_buffer_postenable(struct iio_dev *indio_dev);
|
||||
int iio_triggered_buffer_predisable(struct iio_dev *indio_dev);
|
||||
|
|
Загрузка…
Ссылка в новой задаче