tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
staging:iio: Use iio_push_to_buffer
Consistently use iio_push_to_buffer instead of manually calling the buffers
store_to callback.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
authored by
Lars-Peter Clausen
and committed by
Jonathan Cameron
00176b36
f38bc926
+16
-29
+1
-2
drivers/staging/iio/accel/adis16201_ring.c
+1
-2
drivers/staging/iio/accel/adis16201_ring.c
···
62
62
struct iio_poll_func *pf = p;
63
63
struct iio_dev *indio_dev = pf->indio_dev;
64
64
struct adis16201_state *st = iio_priv(indio_dev);
65
-
struct iio_buffer *ring = indio_dev->buffer;
66
65
67
66
int i = 0;
68
67
s16 *data;
···
82
83
if (indio_dev->scan_timestamp)
83
84
*((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp;
84
85
85
-
ring->access->store_to(ring, (u8 *)data, pf->timestamp);
86
+
iio_push_to_buffer(indio_dev->buffer, (u8 *)data, pf->timestamp);
86
87
87
88
kfree(data);
88
89
done:
+1
-4
drivers/staging/iio/accel/adis16203_ring.c
+1
-4
drivers/staging/iio/accel/adis16203_ring.c
···
61
61
struct iio_poll_func *pf = p;
62
62
struct iio_dev *indio_dev = pf->indio_dev;
63
63
struct adis16203_state *st = iio_priv(indio_dev);
64
-
struct iio_buffer *ring = indio_dev->buffer;
65
64
66
65
int i = 0;
67
66
s16 *data;
···
81
82
if (indio_dev->scan_timestamp)
82
83
*((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp;
83
84
84
-
ring->access->store_to(ring,
85
-
(u8 *)data,
86
-
pf->timestamp);
85
+
iio_push_to_buffer(indio_dev->buffer, (u8 *)data, pf->timestamp);
87
86
88
87
kfree(data);
89
88
done:
+1
-2
drivers/staging/iio/accel/adis16204_ring.c
+1
-2
drivers/staging/iio/accel/adis16204_ring.c
···
59
59
struct iio_poll_func *pf = p;
60
60
struct iio_dev *indio_dev = pf->indio_dev;
61
61
struct adis16204_state *st = iio_priv(indio_dev);
62
-
struct iio_buffer *ring = indio_dev->buffer;
63
62
int i = 0;
64
63
s16 *data;
65
64
···
78
79
if (indio_dev->scan_timestamp)
79
80
*((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp;
80
81
81
-
ring->access->store_to(ring, (u8 *)data, pf->timestamp);
82
+
iio_push_to_buffer(indio_dev->buffer, (u8 *)data, pf->timestamp);
82
83
83
84
kfree(data);
84
85
done:
+1
-2
drivers/staging/iio/accel/adis16209_ring.c
+1
-2
drivers/staging/iio/accel/adis16209_ring.c
···
59
59
struct iio_poll_func *pf = p;
60
60
struct iio_dev *indio_dev = pf->indio_dev;
61
61
struct adis16209_state *st = iio_priv(indio_dev);
62
-
struct iio_buffer *ring = indio_dev->buffer;
63
62
int i = 0;
64
63
s16 *data;
65
64
···
78
79
if (indio_dev->scan_timestamp)
79
80
*((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp;
80
81
81
-
ring->access->store_to(ring, (u8 *)data, pf->timestamp);
82
+
iio_push_to_buffer(indio_dev->buffer, (u8 *)data, pf->timestamp);
82
83
83
84
kfree(data);
84
85
done:
+1
-2
drivers/staging/iio/accel/adis16240_ring.c
+1
-2
drivers/staging/iio/accel/adis16240_ring.c
···
56
56
struct iio_poll_func *pf = p;
57
57
struct iio_dev *indio_dev = pf->indio_dev;
58
58
struct adis16240_state *st = iio_priv(indio_dev);
59
-
struct iio_buffer *ring = indio_dev->buffer;
60
59
61
60
int i = 0;
62
61
s16 *data;
···
76
77
if (indio_dev->scan_timestamp)
77
78
*((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp;
78
79
79
-
ring->access->store_to(ring, (u8 *)data, pf->timestamp);
80
+
iio_push_to_buffer(indio_dev->buffer, (u8 *)data, pf->timestamp);
80
81
81
82
kfree(data);
82
83
done:
+1
-2
drivers/staging/iio/accel/lis3l02dq_ring.c
+1
-2
drivers/staging/iio/accel/lis3l02dq_ring.c
···
135
135
{
136
136
struct iio_poll_func *pf = p;
137
137
struct iio_dev *indio_dev = pf->indio_dev;
138
-
struct iio_buffer *buffer = indio_dev->buffer;
139
138
int len = 0;
140
139
char *data;
141
140
···
152
153
if (indio_dev->scan_timestamp)
153
154
*(s64 *)((u8 *)data + ALIGN(len, sizeof(s64)))
154
155
= pf->timestamp;
155
-
buffer->access->store_to(buffer, (u8 *)data, pf->timestamp);
156
+
iio_push_to_buffer(indio_dev->buffer, (u8 *)data, pf->timestamp);
156
157
157
158
kfree(data);
158
159
done:
+1
-2
drivers/staging/iio/adc/ad7298_ring.c
+1
-2
drivers/staging/iio/adc/ad7298_ring.c
···
75
75
struct iio_poll_func *pf = p;
76
76
struct iio_dev *indio_dev = pf->indio_dev;
77
77
struct ad7298_state *st = iio_priv(indio_dev);
78
-
struct iio_buffer *ring = indio_dev->buffer;
79
78
s64 time_ns = 0;
80
79
__u16 buf[16];
81
80
int b_sent, i;
···
93
94
indio_dev->masklength); i++)
94
95
buf[i] = be16_to_cpu(st->rx_buf[i]);
95
96
96
-
indio_dev->buffer->access->store_to(ring, (u8 *)buf, time_ns);
97
+
iio_push_to_buffer(indio_dev->buffer, (u8 *)buf, time_ns);
97
98
98
99
done:
99
100
iio_trigger_notify_done(indio_dev->trig);
+1
-1
drivers/staging/iio/adc/ad7476_ring.c
+1
-1
drivers/staging/iio/adc/ad7476_ring.c
···
44
44
memcpy(rxbuf + indio_dev->scan_bytes - sizeof(s64),
45
45
&time_ns, sizeof(time_ns));
46
46
47
-
indio_dev->buffer->access->store_to(indio_dev->buffer, rxbuf, time_ns);
47
+
iio_push_to_buffer(indio_dev->buffer, rxbuf, time_ns);
48
48
done:
49
49
iio_trigger_notify_done(indio_dev->trig);
50
50
kfree(rxbuf);
+1
-2
drivers/staging/iio/adc/ad7606_ring.c
+1
-2
drivers/staging/iio/adc/ad7606_ring.c
···
46
46
struct ad7606_state *st = container_of(work_s, struct ad7606_state,
47
47
poll_work);
48
48
struct iio_dev *indio_dev = iio_priv_to_dev(st);
49
-
struct iio_buffer *ring = indio_dev->buffer;
50
49
s64 time_ns;
51
50
__u8 *buf;
52
51
int ret;
···
83
84
if (indio_dev->scan_timestamp)
84
85
*((s64 *)(buf + indio_dev->scan_bytes - sizeof(s64))) = time_ns;
85
86
86
-
ring->access->store_to(indio_dev->buffer, buf, time_ns);
87
+
iio_push_to_buffer(indio_dev->buffer, buf, time_ns);
87
88
done:
88
89
gpio_set_value(st->pdata->gpio_convst, 0);
89
90
iio_trigger_notify_done(indio_dev->trig);
+1
-1
drivers/staging/iio/adc/ad7887_ring.c
+1
-1
drivers/staging/iio/adc/ad7887_ring.c
···
95
95
memcpy(buf + indio_dev->scan_bytes - sizeof(s64),
96
96
&time_ns, sizeof(time_ns));
97
97
98
-
indio_dev->buffer->access->store_to(indio_dev->buffer, buf, time_ns);
98
+
iio_push_to_buffer(indio_dev->buffer, buf, time_ns);
99
99
done:
100
100
kfree(buf);
101
101
iio_trigger_notify_done(indio_dev->trig);
+1
-2
drivers/staging/iio/adc/ad799x_ring.c
+1
-2
drivers/staging/iio/adc/ad799x_ring.c
···
35
35
struct iio_poll_func *pf = p;
36
36
struct iio_dev *indio_dev = pf->indio_dev;
37
37
struct ad799x_state *st = iio_priv(indio_dev);
38
-
struct iio_buffer *ring = indio_dev->buffer;
39
38
s64 time_ns;
40
39
__u8 *rxbuf;
41
40
int b_sent;
···
77
78
memcpy(rxbuf + indio_dev->scan_bytes - sizeof(s64),
78
79
&time_ns, sizeof(time_ns));
79
80
80
-
ring->access->store_to(indio_dev->buffer, rxbuf, time_ns);
81
+
iio_push_to_buffer(indio_dev->buffer, rxbuf, time_ns);
81
82
done:
82
83
kfree(rxbuf);
83
84
out:
+1
-2
drivers/staging/iio/gyro/adis16260_ring.c
+1
-2
drivers/staging/iio/gyro/adis16260_ring.c
···
62
62
struct iio_poll_func *pf = p;
63
63
struct iio_dev *indio_dev = pf->indio_dev;
64
64
struct adis16260_state *st = iio_priv(indio_dev);
65
-
struct iio_buffer *ring = indio_dev->buffer;
66
65
int i = 0;
67
66
s16 *data;
68
67
···
81
82
if (indio_dev->scan_timestamp)
82
83
*((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp;
83
84
84
-
ring->access->store_to(ring, (u8 *)data, pf->timestamp);
85
+
iio_push_to_buffer(indio_dev->buffer, (u8 *)data, pf->timestamp);
85
86
86
87
kfree(data);
87
88
done:
+1
-1
drivers/staging/iio/iio_simple_dummy_buffer.c
+1
-1
drivers/staging/iio/iio_simple_dummy_buffer.c
+1
-1
drivers/staging/iio/impedance-analyzer/ad5933.c
+1
-1
drivers/staging/iio/impedance-analyzer/ad5933.c
···
678
678
buf[0] = be16_to_cpu(buf[0]);
679
679
}
680
680
/* save datum to the ring */
681
-
ring->access->store_to(ring, (u8 *)buf, iio_get_time_ns());
681
+
iio_push_to_buffer(ring, (u8 *)buf, iio_get_time_ns());
682
682
} else {
683
683
/* no data available - try again later */
684
684
schedule_delayed_work(&st->work, st->poll_time_jiffies);
+1
-1
drivers/staging/iio/imu/adis16400_ring.c
+1
-1
drivers/staging/iio/imu/adis16400_ring.c
···
150
150
/* Guaranteed to be aligned with 8 byte boundary */
151
151
if (ring->scan_timestamp)
152
152
*((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp;
153
-
ring->access->store_to(indio_dev->buffer, (u8 *) data, pf->timestamp);
153
+
iio_push_to_buffer(ring, (u8 *) data, pf->timestamp);
154
154
155
155
done:
156
156
kfree(data);
+1
-2
drivers/staging/iio/meter/ade7758_ring.c
+1
-2
drivers/staging/iio/meter/ade7758_ring.c
···
61
61
{
62
62
struct iio_poll_func *pf = p;
63
63
struct iio_dev *indio_dev = pf->indio_dev;
64
-
struct iio_buffer *ring = indio_dev->buffer;
65
64
struct ade7758_state *st = iio_priv(indio_dev);
66
65
s64 dat64[2];
67
66
u32 *dat32 = (u32 *)dat64;
···
73
74
if (indio_dev->scan_timestamp)
74
75
dat64[1] = pf->timestamp;
75
76
76
-
ring->access->store_to(ring, (u8 *)dat64, pf->timestamp);
77
+
iio_push_to_buffer(indio_dev->buffer, (u8 *)dat64, pf->timestamp);
77
78
78
79
iio_trigger_notify_done(indio_dev->trig);
79
80