Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit ce56ade6ae74e604a4b5d6ea5b1d58960fa8e7aa

Authored by Lars-Peter Clausen
Committed by Jonathan Cameron
1 parent a0d7bf7dd1
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

iio: Drop timestamp parameter from buffer store_to callback 

Drop timestamp parameter from buffer store_to callback and subsequently from
iio_push_to_buffer. The timestamp parameter is unused and it seems likely that
it will stay unused in the future, so it should be safe to remove it.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>

Showing 30 changed files with 34 additions and 43 deletions Side-by-side Diff

drivers/iio/accel/hid-sensor-accel-3d.c
Diff comments   View file @ ce56ade
... ... @@ -198,7 +198,6 @@
198 198 static void hid_sensor_push_data(struct iio_dev *indio_dev, u8 *data, int len)
199 199 {
200 200 struct iio_buffer *buffer = indio_dev->buffer;
201   - s64 timestamp = iio_get_time_ns();
202 201 int datum_sz;
203 202  
204 203 dev_dbg(&indio_dev->dev, "hid_sensor_push_data\n");
... ... @@ -212,7 +211,7 @@
212 211 datum_sz);
213 212 return;
214 213 }
215   - iio_push_to_buffer(buffer, (u8 *)data, timestamp);
  214 + iio_push_to_buffer(buffer, (u8 *)data);
216 215 }
217 216  
218 217 /* Callback handler to send event after all samples are received and captured */
drivers/iio/adc/ad7266.c
Diff comments   View file @ ce56ade
... ... @@ -99,7 +99,7 @@
99 99 if (ret == 0) {
100 100 if (indio_dev->scan_timestamp)
101 101 ((s64 *)st->data)[1] = pf->timestamp;
102   - iio_push_to_buffer(buffer, (u8 *)st->data, pf->timestamp);
  102 + iio_push_to_buffer(buffer, (u8 *)st->data);
103 103 }
104 104  
105 105 iio_trigger_notify_done(indio_dev->trig);
drivers/iio/adc/ad_sigma_delta.c
Diff comments   View file @ ce56ade
... ... @@ -391,7 +391,7 @@
391 391 break;
392 392 }
393 393  
394   - iio_push_to_buffer(indio_dev->buffer, (uint8_t *)data, pf->timestamp);
  394 + iio_push_to_buffer(indio_dev->buffer, (uint8_t *)data);
395 395  
396 396 iio_trigger_notify_done(indio_dev->trig);
397 397 sigma_delta->irq_dis = false;
drivers/iio/adc/at91_adc.c
Diff comments   View file @ ce56ade
... ... @@ -82,7 +82,7 @@
82 82 *timestamp = pf->timestamp;
83 83 }
84 84  
85   - buffer->access->store_to(buffer, (u8 *)st->buffer, pf->timestamp);
  85 + buffer->access->store_to(buffer, (u8 *)st->buffer);
86 86  
87 87 iio_trigger_notify_done(idev->trig);
88 88 st->irq_enabled = true;
drivers/iio/gyro/hid-sensor-gyro-3d.c
Diff comments   View file @ ce56ade
... ... @@ -198,7 +198,6 @@
198 198 static void hid_sensor_push_data(struct iio_dev *indio_dev, u8 *data, int len)
199 199 {
200 200 struct iio_buffer *buffer = indio_dev->buffer;
201   - s64 timestamp = iio_get_time_ns();
202 201 int datum_sz;
203 202  
204 203 dev_dbg(&indio_dev->dev, "hid_sensor_push_data\n");
... ... @@ -212,7 +211,7 @@
212 211 datum_sz);
213 212 return;
214 213 }
215   - iio_push_to_buffer(buffer, (u8 *)data, timestamp);
  214 + iio_push_to_buffer(buffer, (u8 *)data);
216 215 }
217 216  
218 217 /* Callback handler to send event after all samples are received and captured */
drivers/iio/industrialio-buffer.c
Diff comments   View file @ ce56ade
... ... @@ -682,12 +682,11 @@
682 682 return buffer->demux_bounce;
683 683 }
684 684  
685   -int iio_push_to_buffer(struct iio_buffer *buffer, unsigned char *data,
686   - s64 timestamp)
  685 +int iio_push_to_buffer(struct iio_buffer *buffer, unsigned char *data)
687 686 {
688 687 unsigned char *dataout = iio_demux(buffer, data);
689 688  
690   - return buffer->access->store_to(buffer, dataout, timestamp);
  689 + return buffer->access->store_to(buffer, dataout);
691 690 }
692 691 EXPORT_SYMBOL_GPL(iio_push_to_buffer);
693 692  
drivers/iio/kfifo_buf.c
Diff comments   View file @ ce56ade
... ... @@ -95,8 +95,7 @@
95 95 }
96 96  
97 97 static int iio_store_to_kfifo(struct iio_buffer *r,
98   - u8 *data,
99   - s64 timestamp)
  98 + u8 *data)
100 99 {
101 100 int ret;
102 101 struct iio_kfifo *kf = iio_to_kfifo(r);
drivers/iio/light/adjd_s311.c
Diff comments   View file @ ce56ade
... ... @@ -187,7 +187,7 @@
187 187 if (indio_dev->scan_timestamp)
188 188 *(s64 *)((u8 *)data->buffer + ALIGN(len, sizeof(s64)))
189 189 = time_ns;
190   - iio_push_to_buffer(buffer, (u8 *)data->buffer, time_ns);
  190 + iio_push_to_buffer(buffer, (u8 *)data->buffer);
191 191  
192 192 done:
193 193 iio_trigger_notify_done(indio_dev->trig);
drivers/iio/light/hid-sensor-als.c
Diff comments   View file @ ce56ade
... ... @@ -177,7 +177,6 @@
177 177 static void hid_sensor_push_data(struct iio_dev *indio_dev, u8 *data, int len)
178 178 {
179 179 struct iio_buffer *buffer = indio_dev->buffer;
180   - s64 timestamp = iio_get_time_ns();
181 180 int datum_sz;
182 181  
183 182 dev_dbg(&indio_dev->dev, "hid_sensor_push_data\n");
... ... @@ -191,7 +190,7 @@
191 190 datum_sz);
192 191 return;
193 192 }
194   - iio_push_to_buffer(buffer, (u8 *)data, timestamp);
  193 + iio_push_to_buffer(buffer, (u8 *)data);
195 194 }
196 195  
197 196 /* Callback handler to send event after all samples are received and captured */
drivers/iio/magnetometer/hid-sensor-magn-3d.c
Diff comments   View file @ ce56ade
... ... @@ -199,7 +199,6 @@
199 199 static void hid_sensor_push_data(struct iio_dev *indio_dev, u8 *data, int len)
200 200 {
201 201 struct iio_buffer *buffer = indio_dev->buffer;
202   - s64 timestamp = iio_get_time_ns();
203 202 int datum_sz;
204 203  
205 204 dev_dbg(&indio_dev->dev, "hid_sensor_push_data\n");
... ... @@ -213,7 +212,7 @@
213 212 datum_sz);
214 213 return;
215 214 }
216   - iio_push_to_buffer(buffer, (u8 *)data, timestamp);
  215 + iio_push_to_buffer(buffer, (u8 *)data);
217 216 }
218 217  
219 218 /* Callback handler to send event after all samples are received and captured */
drivers/staging/iio/accel/adis16201_ring.c
Diff comments   View file @ ce56ade
... ... @@ -82,7 +82,7 @@
82 82 if (indio_dev->scan_timestamp)
83 83 *((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp;
84 84  
85   - iio_push_to_buffer(indio_dev->buffer, (u8 *)data, pf->timestamp);
  85 + iio_push_to_buffer(indio_dev->buffer, (u8 *)data);
86 86  
87 87 kfree(data);
88 88 done:
drivers/staging/iio/accel/adis16203_ring.c
Diff comments   View file @ ce56ade
... ... @@ -81,7 +81,7 @@
81 81 if (indio_dev->scan_timestamp)
82 82 *((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp;
83 83  
84   - iio_push_to_buffer(indio_dev->buffer, (u8 *)data, pf->timestamp);
  84 + iio_push_to_buffer(indio_dev->buffer, (u8 *)data);
85 85  
86 86 kfree(data);
87 87 done:
drivers/staging/iio/accel/adis16204_ring.c
Diff comments   View file @ ce56ade
... ... @@ -78,7 +78,7 @@
78 78 if (indio_dev->scan_timestamp)
79 79 *((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp;
80 80  
81   - iio_push_to_buffer(indio_dev->buffer, (u8 *)data, pf->timestamp);
  81 + iio_push_to_buffer(indio_dev->buffer, (u8 *)data);
82 82  
83 83 kfree(data);
84 84 done:
drivers/staging/iio/accel/adis16209_ring.c
Diff comments   View file @ ce56ade
... ... @@ -78,7 +78,7 @@
78 78 if (indio_dev->scan_timestamp)
79 79 *((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp;
80 80  
81   - iio_push_to_buffer(indio_dev->buffer, (u8 *)data, pf->timestamp);
  81 + iio_push_to_buffer(indio_dev->buffer, (u8 *)data);
82 82  
83 83 kfree(data);
84 84 done:
drivers/staging/iio/accel/adis16240_ring.c
Diff comments   View file @ ce56ade
... ... @@ -76,7 +76,7 @@
76 76 if (indio_dev->scan_timestamp)
77 77 *((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp;
78 78  
79   - iio_push_to_buffer(indio_dev->buffer, (u8 *)data, pf->timestamp);
  79 + iio_push_to_buffer(indio_dev->buffer, (u8 *)data);
80 80  
81 81 kfree(data);
82 82 done:
drivers/staging/iio/accel/lis3l02dq_ring.c
Diff comments   View file @ ce56ade
... ... @@ -152,7 +152,7 @@
152 152 if (indio_dev->scan_timestamp)
153 153 *(s64 *)((u8 *)data + ALIGN(len, sizeof(s64)))
154 154 = pf->timestamp;
155   - iio_push_to_buffer(indio_dev->buffer, (u8 *)data, pf->timestamp);
  155 + iio_push_to_buffer(indio_dev->buffer, (u8 *)data);
156 156  
157 157 kfree(data);
158 158 done:
drivers/staging/iio/adc/ad7298_ring.c
Diff comments   View file @ ce56ade
... ... @@ -93,7 +93,7 @@
93 93 indio_dev->masklength); i++)
94 94 buf[i] = be16_to_cpu(st->rx_buf[i]);
95 95  
96   - iio_push_to_buffer(indio_dev->buffer, (u8 *)buf, time_ns);
  96 + iio_push_to_buffer(indio_dev->buffer, (u8 *)buf);
97 97  
98 98 done:
99 99 iio_trigger_notify_done(indio_dev->trig);
drivers/staging/iio/adc/ad7476_ring.c
Diff comments   View file @ ce56ade
... ... @@ -44,7 +44,7 @@
44 44 memcpy(rxbuf + indio_dev->scan_bytes - sizeof(s64),
45 45 &time_ns, sizeof(time_ns));
46 46  
47   - iio_push_to_buffer(indio_dev->buffer, rxbuf, time_ns);
  47 + iio_push_to_buffer(indio_dev->buffer, rxbuf);
48 48 done:
49 49 iio_trigger_notify_done(indio_dev->trig);
50 50 kfree(rxbuf);
drivers/staging/iio/adc/ad7606_ring.c
Diff comments   View file @ ce56ade
... ... @@ -83,7 +83,7 @@
83 83 if (indio_dev->scan_timestamp)
84 84 *((s64 *)(buf + indio_dev->scan_bytes - sizeof(s64))) = time_ns;
85 85  
86   - iio_push_to_buffer(indio_dev->buffer, buf, time_ns);
  86 + iio_push_to_buffer(indio_dev->buffer, buf);
87 87 done:
88 88 gpio_set_value(st->pdata->gpio_convst, 0);
89 89 iio_trigger_notify_done(indio_dev->trig);
drivers/staging/iio/adc/ad7887_ring.c
Diff comments   View file @ ce56ade
... ... @@ -95,7 +95,7 @@
95 95 memcpy(buf + indio_dev->scan_bytes - sizeof(s64),
96 96 &time_ns, sizeof(time_ns));
97 97  
98   - iio_push_to_buffer(indio_dev->buffer, buf, time_ns);
  98 + iio_push_to_buffer(indio_dev->buffer, buf);
99 99 done:
100 100 kfree(buf);
101 101 iio_trigger_notify_done(indio_dev->trig);
drivers/staging/iio/adc/ad799x_ring.c
Diff comments   View file @ ce56ade
... ... @@ -77,7 +77,7 @@
77 77 memcpy(rxbuf + indio_dev->scan_bytes - sizeof(s64),
78 78 &time_ns, sizeof(time_ns));
79 79  
80   - iio_push_to_buffer(indio_dev->buffer, rxbuf, time_ns);
  80 + iio_push_to_buffer(indio_dev->buffer, rxbuf);
81 81 done:
82 82 kfree(rxbuf);
83 83 out:
drivers/staging/iio/adc/max1363_ring.c
Diff comments   View file @ ce56ade
... ... @@ -80,7 +80,7 @@
80 80  
81 81 if (indio_dev->scan_timestamp)
82 82 memcpy(rxbuf + d_size - sizeof(s64), &time_ns, sizeof(time_ns));
83   - iio_push_to_buffer(indio_dev->buffer, rxbuf, time_ns);
  83 + iio_push_to_buffer(indio_dev->buffer, rxbuf);
84 84  
85 85 done_free:
86 86 kfree(rxbuf);
drivers/staging/iio/adc/mxs-lradc.c
Diff comments   View file @ ce56ade
... ... @@ -256,7 +256,7 @@
256 256 *timestamp = pf->timestamp;
257 257 }
258 258  
259   - iio_push_to_buffer(buffer, (u8 *)lradc->buffer, pf->timestamp);
  259 + iio_push_to_buffer(buffer, (u8 *)lradc->buffer);
260 260  
261 261 iio_trigger_notify_done(iio->trig);
262 262  
drivers/staging/iio/gyro/adis16260_ring.c
Diff comments   View file @ ce56ade
... ... @@ -81,7 +81,7 @@
81 81 if (indio_dev->scan_timestamp)
82 82 *((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp;
83 83  
84   - iio_push_to_buffer(indio_dev->buffer, (u8 *)data, pf->timestamp);
  84 + iio_push_to_buffer(indio_dev->buffer, (u8 *)data);
85 85  
86 86 kfree(data);
87 87 done:
drivers/staging/iio/iio_simple_dummy_buffer.c
Diff comments   View file @ ce56ade
... ... @@ -87,7 +87,7 @@
87 87 if (indio_dev->scan_timestamp)
88 88 *(s64 *)((u8 *)data + ALIGN(len, sizeof(s64)))
89 89 = iio_get_time_ns();
90   - iio_push_to_buffer(buffer, (u8 *)data, pf->timestamp);
  90 + iio_push_to_buffer(buffer, (u8 *)data);
91 91  
92 92 kfree(data);
93 93  
drivers/staging/iio/impedance-analyzer/ad5933.c
Diff comments   View file @ ce56ade
... ... @@ -678,7 +678,7 @@
678 678 buf[0] = be16_to_cpu(buf[0]);
679 679 }
680 680 /* save datum to the ring */
681   - iio_push_to_buffer(ring, (u8 *)buf, iio_get_time_ns());
  681 + iio_push_to_buffer(ring, (u8 *)buf);
682 682 } else {
683 683 /* no data available - try again later */
684 684 schedule_delayed_work(&st->work, st->poll_time_jiffies);
drivers/staging/iio/imu/adis16400_ring.c
Diff comments   View file @ ce56ade
... ... @@ -150,7 +150,7 @@
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   - iio_push_to_buffer(ring, (u8 *) data, pf->timestamp);
  153 + iio_push_to_buffer(ring, (u8 *) data);
154 154  
155 155 done:
156 156 kfree(data);
drivers/staging/iio/meter/ade7758_ring.c
Diff comments   View file @ ce56ade
... ... @@ -73,7 +73,7 @@
73 73 if (indio_dev->scan_timestamp)
74 74 dat64[1] = pf->timestamp;
75 75  
76   - iio_push_to_buffer(indio_dev->buffer, (u8 *)dat64, pf->timestamp);
  76 + iio_push_to_buffer(indio_dev->buffer, (u8 *)dat64);
77 77  
78 78 iio_trigger_notify_done(indio_dev->trig);
79 79  
drivers/staging/iio/ring_sw.c
Diff comments   View file @ ce56ade
... ... @@ -65,7 +65,7 @@
65 65 /* Lock always held if their is a chance this may be called */
66 66 /* Only one of these per ring may run concurrently - enforced by drivers */
67 67 static int iio_store_to_sw_ring(struct iio_sw_ring_buffer *ring,
68   - unsigned char *data, s64 timestamp)
  68 + unsigned char *data)
69 69 {
70 70 int ret = 0;
71 71 unsigned char *temp_ptr, *change_test_ptr;
72 72  
... ... @@ -256,11 +256,10 @@
256 256 }
257 257  
258 258 static int iio_store_to_sw_rb(struct iio_buffer *r,
259   - u8 *data,
260   - s64 timestamp)
  259 + u8 *data)
261 260 {
262 261 struct iio_sw_ring_buffer *ring = iio_to_sw_ring(r);
263   - return iio_store_to_sw_ring(ring, data, timestamp);
  262 + return iio_store_to_sw_ring(ring, data);
264 263 }
265 264  
266 265 static int iio_request_update_sw_rb(struct iio_buffer *r)
include/linux/iio/buffer.h
Diff comments   View file @ ce56ade
... ... @@ -36,7 +36,7 @@
36 36 * any of them not existing.
37 37 **/
38 38 struct iio_buffer_access_funcs {
39   - int (*store_to)(struct iio_buffer *buffer, u8 *data, s64 timestamp);
  39 + int (*store_to)(struct iio_buffer *buffer, u8 *data);
40 40 int (*read_first_n)(struct iio_buffer *buffer,
41 41 size_t n,
42 42 char __user *buf);
43 43  
... ... @@ -118,10 +118,8 @@
118 118 * iio_push_to_buffer() - push to a registered buffer.
119 119 * @buffer: IIO buffer structure for device
120 120 * @data: the data to push to the buffer
121   - * @timestamp: timestamp to associate with the data
122 121 */
123   -int iio_push_to_buffer(struct iio_buffer *buffer, unsigned char *data,
124   - s64 timestamp);
  122 +int iio_push_to_buffer(struct iio_buffer *buffer, unsigned char *data);
125 123  
126 124 int iio_update_demux(struct iio_dev *indio_dev);
127 125