tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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>
authored by
Jonathan Cameron
and committed by
Greg Kroah-Hartman
3b99fb76
0baf29d6
+40
-40
+2
-2
drivers/staging/iio/accel/adis16201_ring.c
+2
-2
drivers/staging/iio/accel/adis16201_ring.c
···
99
99
100
100
static const struct iio_ring_setup_ops adis16201_ring_setup_ops = {
101
101
.preenable = &iio_sw_ring_preenable,
102
-
.postenable = &iio_triggered_ring_postenable,
103
-
.predisable = &iio_triggered_ring_predisable,
102
+
.postenable = &iio_triggered_buffer_postenable,
103
+
.predisable = &iio_triggered_buffer_predisable,
104
104
};
105
105
106
106
int adis16201_configure_ring(struct iio_dev *indio_dev)
+2
-2
drivers/staging/iio/accel/adis16203_ring.c
+2
-2
drivers/staging/iio/accel/adis16203_ring.c
···
101
101
102
102
static const struct iio_ring_setup_ops adis16203_ring_setup_ops = {
103
103
.preenable = &iio_sw_ring_preenable,
104
-
.postenable = &iio_triggered_ring_postenable,
105
-
.predisable = &iio_triggered_ring_predisable,
104
+
.postenable = &iio_triggered_buffer_postenable,
105
+
.predisable = &iio_triggered_buffer_predisable,
106
106
};
107
107
108
108
int adis16203_configure_ring(struct iio_dev *indio_dev)
+2
-2
drivers/staging/iio/accel/adis16204_ring.c
+2
-2
drivers/staging/iio/accel/adis16204_ring.c
···
96
96
97
97
static const struct iio_ring_setup_ops adis16204_ring_setup_ops = {
98
98
.preenable = &iio_sw_ring_preenable,
99
-
.postenable = &iio_triggered_ring_postenable,
100
-
.predisable = &iio_triggered_ring_predisable,
99
+
.postenable = &iio_triggered_buffer_postenable,
100
+
.predisable = &iio_triggered_buffer_predisable,
101
101
};
102
102
103
103
int adis16204_configure_ring(struct iio_dev *indio_dev)
+2
-2
drivers/staging/iio/accel/adis16209_ring.c
+2
-2
drivers/staging/iio/accel/adis16209_ring.c
···
96
96
97
97
static const struct iio_ring_setup_ops adis16209_ring_setup_ops = {
98
98
.preenable = &iio_sw_ring_preenable,
99
-
.postenable = &iio_triggered_ring_postenable,
100
-
.predisable = &iio_triggered_ring_predisable,
99
+
.postenable = &iio_triggered_buffer_postenable,
100
+
.predisable = &iio_triggered_buffer_predisable,
101
101
};
102
102
103
103
int adis16209_configure_ring(struct iio_dev *indio_dev)
+2
-2
drivers/staging/iio/accel/adis16240_ring.c
+2
-2
drivers/staging/iio/accel/adis16240_ring.c
···
93
93
94
94
static const struct iio_ring_setup_ops adis16240_ring_setup_ops = {
95
95
.preenable = &iio_sw_ring_preenable,
96
-
.postenable = &iio_triggered_ring_postenable,
97
-
.predisable = &iio_triggered_ring_predisable,
96
+
.postenable = &iio_triggered_buffer_postenable,
97
+
.predisable = &iio_triggered_buffer_predisable,
98
98
};
99
99
100
100
int adis16240_configure_ring(struct iio_dev *indio_dev)
+2
-2
drivers/staging/iio/accel/lis3l02dq_ring.c
+2
-2
drivers/staging/iio/accel/lis3l02dq_ring.c
···
386
386
if (ret)
387
387
goto error_ret;
388
388
389
-
return iio_triggered_ring_postenable(indio_dev);
389
+
return iio_triggered_buffer_postenable(indio_dev);
390
390
error_ret:
391
391
return ret;
392
392
}
···
397
397
u8 t;
398
398
int ret;
399
399
400
-
ret = iio_triggered_ring_predisable(indio_dev);
400
+
ret = iio_triggered_buffer_predisable(indio_dev);
401
401
if (ret)
402
402
goto error_ret;
403
403
+2
-2
drivers/staging/iio/adc/ad7192.c
+2
-2
drivers/staging/iio/adc/ad7192.c
···
564
564
565
565
static const struct iio_ring_setup_ops ad7192_ring_setup_ops = {
566
566
.preenable = &ad7192_ring_preenable,
567
-
.postenable = &iio_triggered_ring_postenable,
568
-
.predisable = &iio_triggered_ring_predisable,
567
+
.postenable = &iio_triggered_buffer_postenable,
568
+
.predisable = &iio_triggered_buffer_predisable,
569
569
.postdisable = &ad7192_ring_postdisable,
570
570
};
571
571
+2
-2
drivers/staging/iio/adc/ad7298_ring.c
+2
-2
drivers/staging/iio/adc/ad7298_ring.c
···
145
145
146
146
static const struct iio_ring_setup_ops ad7298_ring_setup_ops = {
147
147
.preenable = &ad7298_ring_preenable,
148
-
.postenable = &iio_triggered_ring_postenable,
149
-
.predisable = &iio_triggered_ring_predisable,
148
+
.postenable = &iio_triggered_buffer_postenable,
149
+
.predisable = &iio_triggered_buffer_predisable,
150
150
};
151
151
152
152
int ad7298_register_ring_funcs_and_init(struct iio_dev *indio_dev)
+2
-2
drivers/staging/iio/adc/ad7476_ring.c
+2
-2
drivers/staging/iio/adc/ad7476_ring.c
···
107
107
108
108
static const struct iio_ring_setup_ops ad7476_ring_setup_ops = {
109
109
.preenable = &ad7476_ring_preenable,
110
-
.postenable = &iio_triggered_ring_postenable,
111
-
.predisable = &iio_triggered_ring_predisable,
110
+
.postenable = &iio_triggered_buffer_postenable,
111
+
.predisable = &iio_triggered_buffer_predisable,
112
112
};
113
113
114
114
int ad7476_register_ring_funcs_and_init(struct iio_dev *indio_dev)
+2
-2
drivers/staging/iio/adc/ad7606_ring.c
+2
-2
drivers/staging/iio/adc/ad7606_ring.c
···
149
149
150
150
static const struct iio_ring_setup_ops ad7606_ring_setup_ops = {
151
151
.preenable = &ad7606_ring_preenable,
152
-
.postenable = &iio_triggered_ring_postenable,
153
-
.predisable = &iio_triggered_ring_predisable,
152
+
.postenable = &iio_triggered_buffer_postenable,
153
+
.predisable = &iio_triggered_buffer_predisable,
154
154
};
155
155
156
156
int ad7606_register_ring_funcs_and_init(struct iio_dev *indio_dev)
+2
-2
drivers/staging/iio/adc/ad7793.c
+2
-2
drivers/staging/iio/adc/ad7793.c
···
430
430
431
431
static const struct iio_ring_setup_ops ad7793_ring_setup_ops = {
432
432
.preenable = &ad7793_ring_preenable,
433
-
.postenable = &iio_triggered_ring_postenable,
434
-
.predisable = &iio_triggered_ring_predisable,
433
+
.postenable = &iio_triggered_buffer_postenable,
434
+
.predisable = &iio_triggered_buffer_predisable,
435
435
.postdisable = &ad7793_ring_postdisable,
436
436
};
437
437
+2
-2
drivers/staging/iio/adc/ad7887_ring.c
+2
-2
drivers/staging/iio/adc/ad7887_ring.c
···
149
149
150
150
static const struct iio_ring_setup_ops ad7887_ring_setup_ops = {
151
151
.preenable = &ad7887_ring_preenable,
152
-
.postenable = &iio_triggered_ring_postenable,
153
-
.predisable = &iio_triggered_ring_predisable,
152
+
.postenable = &iio_triggered_buffer_postenable,
153
+
.predisable = &iio_triggered_buffer_predisable,
154
154
.postdisable = &ad7887_ring_postdisable,
155
155
};
156
156
+2
-2
drivers/staging/iio/adc/ad799x_ring.c
+2
-2
drivers/staging/iio/adc/ad799x_ring.c
···
155
155
156
156
static const struct iio_ring_setup_ops ad799x_buf_setup_ops = {
157
157
.preenable = &ad799x_ring_preenable,
158
-
.postenable = &iio_triggered_ring_postenable,
159
-
.predisable = &iio_triggered_ring_predisable,
158
+
.postenable = &iio_triggered_buffer_postenable,
159
+
.predisable = &iio_triggered_buffer_predisable,
160
160
};
161
161
162
162
int ad799x_register_ring_funcs_and_init(struct iio_dev *indio_dev)
+2
-2
drivers/staging/iio/adc/max1363_ring.c
+2
-2
drivers/staging/iio/adc/max1363_ring.c
···
150
150
}
151
151
152
152
static const struct iio_ring_setup_ops max1363_ring_setup_ops = {
153
-
.postenable = &iio_triggered_ring_postenable,
153
+
.postenable = &iio_triggered_buffer_postenable,
154
154
.preenable = &max1363_ring_preenable,
155
-
.predisable = &iio_triggered_ring_predisable,
155
+
.predisable = &iio_triggered_buffer_predisable,
156
156
};
157
157
158
158
int max1363_register_ring_funcs_and_init(struct iio_dev *indio_dev)
+2
-2
drivers/staging/iio/gyro/adis16260_ring.c
+2
-2
drivers/staging/iio/gyro/adis16260_ring.c
···
98
98
99
99
static const struct iio_ring_setup_ops adis16260_ring_setup_ops = {
100
100
.preenable = &iio_sw_ring_preenable,
101
-
.postenable = &iio_triggered_ring_postenable,
102
-
.predisable = &iio_triggered_ring_predisable,
101
+
.postenable = &iio_triggered_buffer_postenable,
102
+
.predisable = &iio_triggered_buffer_predisable,
103
103
};
104
104
105
105
int adis16260_configure_ring(struct iio_dev *indio_dev)
+2
-2
drivers/staging/iio/imu/adis16400_ring.c
+2
-2
drivers/staging/iio/imu/adis16400_ring.c
···
168
168
169
169
static const struct iio_ring_setup_ops adis16400_ring_setup_ops = {
170
170
.preenable = &iio_sw_ring_preenable,
171
-
.postenable = &iio_triggered_ring_postenable,
172
-
.predisable = &iio_triggered_ring_predisable,
171
+
.postenable = &iio_triggered_buffer_postenable,
172
+
.predisable = &iio_triggered_buffer_predisable,
173
173
};
174
174
175
175
int adis16400_configure_ring(struct iio_dev *indio_dev)
+4
-4
drivers/staging/iio/industrialio-trigger.c
+4
-4
drivers/staging/iio/industrialio-trigger.c
···
488
488
iio_put_trigger(dev_info->trig);
489
489
}
490
490
491
-
int iio_triggered_ring_postenable(struct iio_dev *indio_dev)
491
+
int iio_triggered_buffer_postenable(struct iio_dev *indio_dev)
492
492
{
493
493
return indio_dev->trig
494
494
? iio_trigger_attach_poll_func(indio_dev->trig,
495
495
indio_dev->pollfunc)
496
496
: 0;
497
497
}
498
-
EXPORT_SYMBOL(iio_triggered_ring_postenable);
498
+
EXPORT_SYMBOL(iio_triggered_buffer_postenable);
499
499
500
-
int iio_triggered_ring_predisable(struct iio_dev *indio_dev)
500
+
int iio_triggered_buffer_predisable(struct iio_dev *indio_dev)
501
501
{
502
502
return indio_dev->trig
503
503
? iio_trigger_dettach_poll_func(indio_dev->trig,
504
504
indio_dev->pollfunc)
505
505
: 0;
506
506
}
507
-
EXPORT_SYMBOL(iio_triggered_ring_predisable);
507
+
EXPORT_SYMBOL(iio_triggered_buffer_predisable);
+2
-2
drivers/staging/iio/meter/ade7758_ring.c
+2
-2
drivers/staging/iio/meter/ade7758_ring.c
···
121
121
122
122
static const struct iio_ring_setup_ops ade7758_ring_setup_ops = {
123
123
.preenable = &ade7758_ring_preenable,
124
-
.postenable = &iio_triggered_ring_postenable,
125
-
.predisable = &iio_triggered_ring_predisable,
124
+
.postenable = &iio_triggered_buffer_postenable,
125
+
.predisable = &iio_triggered_buffer_predisable,
126
126
};
127
127
128
128
void ade7758_unconfigure_ring(struct iio_dev *indio_dev)
+2
-2
drivers/staging/iio/trigger_consumer.h
+2
-2
drivers/staging/iio/trigger_consumer.h
···
48
48
* Two functions for common case where all that happens is a pollfunc
49
49
* is attached and detached from a trigger
50
50
*/
51
-
int iio_triggered_ring_postenable(struct iio_dev *indio_dev);
52
-
int iio_triggered_ring_predisable(struct iio_dev *indio_dev);
51
+
int iio_triggered_buffer_postenable(struct iio_dev *indio_dev);
52
+
int iio_triggered_buffer_predisable(struct iio_dev *indio_dev);