diff options
author | Jonathan Cameron <jic23@cam.ac.uk> | 2011-09-21 11:15:53 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-09-26 17:31:52 -0700 |
commit | 3b99fb7656a73d483b00fd4777646c00db16b040 (patch) | |
tree | 52ca6e05d9cb04ed7d3a8d9e7c13b7c292ee902f /drivers/staging/iio/adc | |
parent | 0baf29d658c71e39f5d7f83249af2fe6a8cd1dcb (diff) |
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>
Diffstat (limited to 'drivers/staging/iio/adc')
-rw-r--r-- | drivers/staging/iio/adc/ad7192.c | 4 | ||||
-rw-r--r-- | drivers/staging/iio/adc/ad7298_ring.c | 4 | ||||
-rw-r--r-- | drivers/staging/iio/adc/ad7476_ring.c | 4 | ||||
-rw-r--r-- | drivers/staging/iio/adc/ad7606_ring.c | 4 | ||||
-rw-r--r-- | drivers/staging/iio/adc/ad7793.c | 4 | ||||
-rw-r--r-- | drivers/staging/iio/adc/ad7887_ring.c | 4 | ||||
-rw-r--r-- | drivers/staging/iio/adc/ad799x_ring.c | 4 | ||||
-rw-r--r-- | drivers/staging/iio/adc/max1363_ring.c | 4 |
8 files changed, 16 insertions, 16 deletions
diff --git a/drivers/staging/iio/adc/ad7192.c b/drivers/staging/iio/adc/ad7192.c index 5a389b81cbc8..3f4e911c4588 100644 --- a/drivers/staging/iio/adc/ad7192.c +++ b/drivers/staging/iio/adc/ad7192.c @@ -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, }; diff --git a/drivers/staging/iio/adc/ad7298_ring.c b/drivers/staging/iio/adc/ad7298_ring.c index 246b2e724d38..9c5ac9dd5efa 100644 --- a/drivers/staging/iio/adc/ad7298_ring.c +++ b/drivers/staging/iio/adc/ad7298_ring.c @@ -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) diff --git a/drivers/staging/iio/adc/ad7476_ring.c b/drivers/staging/iio/adc/ad7476_ring.c index b109afb89846..3cc673c9e5c7 100644 --- a/drivers/staging/iio/adc/ad7476_ring.c +++ b/drivers/staging/iio/adc/ad7476_ring.c @@ -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) diff --git a/drivers/staging/iio/adc/ad7606_ring.c b/drivers/staging/iio/adc/ad7606_ring.c index e6424300c8e7..320ec68a4a38 100644 --- a/drivers/staging/iio/adc/ad7606_ring.c +++ b/drivers/staging/iio/adc/ad7606_ring.c @@ -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) diff --git a/drivers/staging/iio/adc/ad7793.c b/drivers/staging/iio/adc/ad7793.c index 7044ed2932a7..565199d0a939 100644 --- a/drivers/staging/iio/adc/ad7793.c +++ b/drivers/staging/iio/adc/ad7793.c @@ -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, }; diff --git a/drivers/staging/iio/adc/ad7887_ring.c b/drivers/staging/iio/adc/ad7887_ring.c index 36e118cf32e2..159aeb17eed2 100644 --- a/drivers/staging/iio/adc/ad7887_ring.c +++ b/drivers/staging/iio/adc/ad7887_ring.c @@ -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, }; diff --git a/drivers/staging/iio/adc/ad799x_ring.c b/drivers/staging/iio/adc/ad799x_ring.c index 438e81d190c6..7b6488dce7fe 100644 --- a/drivers/staging/iio/adc/ad799x_ring.c +++ b/drivers/staging/iio/adc/ad799x_ring.c @@ -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) diff --git a/drivers/staging/iio/adc/max1363_ring.c b/drivers/staging/iio/adc/max1363_ring.c index abe9e03f36e3..ef1c95f5eb9a 100644 --- a/drivers/staging/iio/adc/max1363_ring.c +++ b/drivers/staging/iio/adc/max1363_ring.c @@ -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) |