Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
media: test-drivers: Rename second ioctl handlers argument to 'void *priv'
The second argument to the ioctl handlers is not a file handle any more.
Rename it from 'void *fh' to 'void *priv', to avoid misconceptions. This
is particularly important in test drivers as they are meant to be used
as reference implementations.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>
authored by
Laurent Pinchart
and committed by
Hans Verkuil
bb74fac7
35c0ae6d
+150
-150
+7
-7
drivers/media/test-drivers/vicodec/vicodec-core.c
+7
-7
drivers/media/test-drivers/vicodec/vicodec-core.c
···
1207
1207
return 0;
1208
1208
}
1209
1209
1210
-
static int vicodec_encoder_cmd(struct file *file, void *fh,
1210
+
static int vicodec_encoder_cmd(struct file *file, void *priv,
1211
1211
struct v4l2_encoder_cmd *ec)
1212
1212
{
1213
1213
struct vicodec_ctx *ctx = file2ctx(file);
1214
1214
int ret;
1215
1215
1216
-
ret = v4l2_m2m_ioctl_try_encoder_cmd(file, fh, ec);
1216
+
ret = v4l2_m2m_ioctl_try_encoder_cmd(file, priv, ec);
1217
1217
if (ret < 0)
1218
1218
return ret;
1219
1219
1220
1220
if (!vb2_is_streaming(&ctx->fh.m2m_ctx->out_q_ctx.q))
1221
1221
return 0;
1222
1222
1223
-
ret = v4l2_m2m_ioctl_encoder_cmd(file, fh, ec);
1223
+
ret = v4l2_m2m_ioctl_encoder_cmd(file, priv, ec);
1224
1224
if (ret < 0)
1225
1225
return ret;
1226
1226
···
1235
1235
return 0;
1236
1236
}
1237
1237
1238
-
static int vicodec_decoder_cmd(struct file *file, void *fh,
1238
+
static int vicodec_decoder_cmd(struct file *file, void *priv,
1239
1239
struct v4l2_decoder_cmd *dc)
1240
1240
{
1241
1241
struct vicodec_ctx *ctx = file2ctx(file);
···
1247
1247
*/
1248
1248
WARN_ON(ctx->is_stateless);
1249
1249
1250
-
ret = v4l2_m2m_ioctl_try_decoder_cmd(file, fh, dc);
1250
+
ret = v4l2_m2m_ioctl_try_decoder_cmd(file, priv, dc);
1251
1251
if (ret < 0)
1252
1252
return ret;
1253
1253
1254
1254
if (!vb2_is_streaming(&ctx->fh.m2m_ctx->out_q_ctx.q))
1255
1255
return 0;
1256
1256
1257
-
ret = v4l2_m2m_ioctl_decoder_cmd(file, fh, dc);
1257
+
ret = v4l2_m2m_ioctl_decoder_cmd(file, priv, dc);
1258
1258
if (ret < 0)
1259
1259
return ret;
1260
1260
···
1269
1269
return 0;
1270
1270
}
1271
1271
1272
-
static int vicodec_enum_framesizes(struct file *file, void *fh,
1272
+
static int vicodec_enum_framesizes(struct file *file, void *priv,
1273
1273
struct v4l2_frmsizeenum *fsize)
1274
1274
{
1275
1275
switch (fsize->pixel_format) {
+1
-1
drivers/media/test-drivers/vimc/vimc-capture.c
+1
-1
drivers/media/test-drivers/vimc/vimc-capture.c
+48
-48
drivers/media/test-drivers/vivid/vivid-core.c
+48
-48
drivers/media/test-drivers/vivid/vivid-core.c
···
277
277
return 0;
278
278
}
279
279
280
-
static int vidioc_s_hw_freq_seek(struct file *file, void *fh, const struct v4l2_hw_freq_seek *a)
280
+
static int vidioc_s_hw_freq_seek(struct file *file, void *priv, const struct v4l2_hw_freq_seek *a)
281
281
{
282
282
struct video_device *vdev = video_devdata(file);
283
283
284
284
if (vdev->vfl_type == VFL_TYPE_RADIO)
285
-
return vivid_radio_rx_s_hw_freq_seek(file, fh, a);
285
+
return vivid_radio_rx_s_hw_freq_seek(file, priv, a);
286
286
return -ENOTTY;
287
287
}
288
288
289
-
static int vidioc_enum_freq_bands(struct file *file, void *fh, struct v4l2_frequency_band *band)
289
+
static int vidioc_enum_freq_bands(struct file *file, void *priv, struct v4l2_frequency_band *band)
290
290
{
291
291
struct video_device *vdev = video_devdata(file);
292
292
293
293
if (vdev->vfl_type == VFL_TYPE_RADIO)
294
-
return vivid_radio_rx_enum_freq_bands(file, fh, band);
294
+
return vivid_radio_rx_enum_freq_bands(file, priv, band);
295
295
if (vdev->vfl_type == VFL_TYPE_SDR)
296
-
return vivid_sdr_enum_freq_bands(file, fh, band);
296
+
return vivid_sdr_enum_freq_bands(file, priv, band);
297
297
return -ENOTTY;
298
298
}
299
299
300
-
static int vidioc_g_tuner(struct file *file, void *fh, struct v4l2_tuner *vt)
300
+
static int vidioc_g_tuner(struct file *file, void *priv, struct v4l2_tuner *vt)
301
301
{
302
302
struct video_device *vdev = video_devdata(file);
303
303
304
304
if (vdev->vfl_type == VFL_TYPE_RADIO)
305
-
return vivid_radio_rx_g_tuner(file, fh, vt);
305
+
return vivid_radio_rx_g_tuner(file, priv, vt);
306
306
if (vdev->vfl_type == VFL_TYPE_SDR)
307
-
return vivid_sdr_g_tuner(file, fh, vt);
308
-
return vivid_video_g_tuner(file, fh, vt);
307
+
return vivid_sdr_g_tuner(file, priv, vt);
308
+
return vivid_video_g_tuner(file, priv, vt);
309
309
}
310
310
311
-
static int vidioc_s_tuner(struct file *file, void *fh, const struct v4l2_tuner *vt)
311
+
static int vidioc_s_tuner(struct file *file, void *priv, const struct v4l2_tuner *vt)
312
312
{
313
313
struct video_device *vdev = video_devdata(file);
314
314
315
315
if (vdev->vfl_type == VFL_TYPE_RADIO)
316
-
return vivid_radio_rx_s_tuner(file, fh, vt);
316
+
return vivid_radio_rx_s_tuner(file, priv, vt);
317
317
if (vdev->vfl_type == VFL_TYPE_SDR)
318
-
return vivid_sdr_s_tuner(file, fh, vt);
319
-
return vivid_video_s_tuner(file, fh, vt);
318
+
return vivid_sdr_s_tuner(file, priv, vt);
319
+
return vivid_video_s_tuner(file, priv, vt);
320
320
}
321
321
322
-
static int vidioc_g_frequency(struct file *file, void *fh, struct v4l2_frequency *vf)
322
+
static int vidioc_g_frequency(struct file *file, void *priv, struct v4l2_frequency *vf)
323
323
{
324
324
struct vivid_dev *dev = video_drvdata(file);
325
325
struct video_device *vdev = video_devdata(file);
···
329
329
vdev->vfl_dir == VFL_DIR_RX ?
330
330
&dev->radio_rx_freq : &dev->radio_tx_freq, vf);
331
331
if (vdev->vfl_type == VFL_TYPE_SDR)
332
-
return vivid_sdr_g_frequency(file, fh, vf);
333
-
return vivid_video_g_frequency(file, fh, vf);
332
+
return vivid_sdr_g_frequency(file, priv, vf);
333
+
return vivid_video_g_frequency(file, priv, vf);
334
334
}
335
335
336
-
static int vidioc_s_frequency(struct file *file, void *fh, const struct v4l2_frequency *vf)
336
+
static int vidioc_s_frequency(struct file *file, void *priv, const struct v4l2_frequency *vf)
337
337
{
338
338
struct vivid_dev *dev = video_drvdata(file);
339
339
struct video_device *vdev = video_devdata(file);
···
343
343
vdev->vfl_dir == VFL_DIR_RX ?
344
344
&dev->radio_rx_freq : &dev->radio_tx_freq, vf);
345
345
if (vdev->vfl_type == VFL_TYPE_SDR)
346
-
return vivid_sdr_s_frequency(file, fh, vf);
347
-
return vivid_video_s_frequency(file, fh, vf);
346
+
return vivid_sdr_s_frequency(file, priv, vf);
347
+
return vivid_video_s_frequency(file, priv, vf);
348
348
}
349
349
350
-
static int vidioc_overlay(struct file *file, void *fh, unsigned i)
350
+
static int vidioc_overlay(struct file *file, void *priv, unsigned i)
351
351
{
352
352
struct video_device *vdev = video_devdata(file);
353
353
354
354
if (vdev->vfl_dir == VFL_DIR_RX)
355
355
return -ENOTTY;
356
-
return vivid_vid_out_overlay(file, fh, i);
356
+
return vivid_vid_out_overlay(file, priv, i);
357
357
}
358
358
359
-
static int vidioc_g_fbuf(struct file *file, void *fh, struct v4l2_framebuffer *a)
359
+
static int vidioc_g_fbuf(struct file *file, void *priv, struct v4l2_framebuffer *a)
360
360
{
361
361
struct video_device *vdev = video_devdata(file);
362
362
363
363
if (vdev->vfl_dir == VFL_DIR_RX)
364
364
return -ENOTTY;
365
-
return vivid_vid_out_g_fbuf(file, fh, a);
365
+
return vivid_vid_out_g_fbuf(file, priv, a);
366
366
}
367
367
368
-
static int vidioc_s_fbuf(struct file *file, void *fh, const struct v4l2_framebuffer *a)
368
+
static int vidioc_s_fbuf(struct file *file, void *priv, const struct v4l2_framebuffer *a)
369
369
{
370
370
struct video_device *vdev = video_devdata(file);
371
371
372
372
if (vdev->vfl_dir == VFL_DIR_RX)
373
373
return -ENOTTY;
374
-
return vivid_vid_out_s_fbuf(file, fh, a);
374
+
return vivid_vid_out_s_fbuf(file, priv, a);
375
375
}
376
376
377
-
static int vidioc_s_std(struct file *file, void *fh, v4l2_std_id id)
377
+
static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id id)
378
378
{
379
379
struct video_device *vdev = video_devdata(file);
380
380
381
381
if (vdev->vfl_dir == VFL_DIR_RX)
382
-
return vivid_vid_cap_s_std(file, fh, id);
383
-
return vivid_vid_out_s_std(file, fh, id);
382
+
return vivid_vid_cap_s_std(file, priv, id);
383
+
return vivid_vid_out_s_std(file, priv, id);
384
384
}
385
385
386
-
static int vidioc_s_dv_timings(struct file *file, void *fh, struct v4l2_dv_timings *timings)
386
+
static int vidioc_s_dv_timings(struct file *file, void *priv, struct v4l2_dv_timings *timings)
387
387
{
388
388
struct video_device *vdev = video_devdata(file);
389
389
390
390
if (vdev->vfl_dir == VFL_DIR_RX)
391
-
return vivid_vid_cap_s_dv_timings(file, fh, timings);
392
-
return vivid_vid_out_s_dv_timings(file, fh, timings);
391
+
return vivid_vid_cap_s_dv_timings(file, priv, timings);
392
+
return vivid_vid_out_s_dv_timings(file, priv, timings);
393
393
}
394
394
395
-
static int vidioc_g_pixelaspect(struct file *file, void *fh,
395
+
static int vidioc_g_pixelaspect(struct file *file, void *priv,
396
396
int type, struct v4l2_fract *f)
397
397
{
398
398
struct video_device *vdev = video_devdata(file);
399
399
400
400
if (vdev->vfl_dir == VFL_DIR_RX)
401
-
return vivid_vid_cap_g_pixelaspect(file, fh, type, f);
402
-
return vivid_vid_out_g_pixelaspect(file, fh, type, f);
401
+
return vivid_vid_cap_g_pixelaspect(file, priv, type, f);
402
+
return vivid_vid_out_g_pixelaspect(file, priv, type, f);
403
403
}
404
404
405
-
static int vidioc_g_selection(struct file *file, void *fh,
405
+
static int vidioc_g_selection(struct file *file, void *priv,
406
406
struct v4l2_selection *sel)
407
407
{
408
408
struct video_device *vdev = video_devdata(file);
409
409
410
410
if (vdev->vfl_dir == VFL_DIR_RX)
411
-
return vivid_vid_cap_g_selection(file, fh, sel);
412
-
return vivid_vid_out_g_selection(file, fh, sel);
411
+
return vivid_vid_cap_g_selection(file, priv, sel);
412
+
return vivid_vid_out_g_selection(file, priv, sel);
413
413
}
414
414
415
-
static int vidioc_s_selection(struct file *file, void *fh,
415
+
static int vidioc_s_selection(struct file *file, void *priv,
416
416
struct v4l2_selection *sel)
417
417
{
418
418
struct video_device *vdev = video_devdata(file);
419
419
420
420
if (vdev->vfl_dir == VFL_DIR_RX)
421
-
return vivid_vid_cap_s_selection(file, fh, sel);
422
-
return vivid_vid_out_s_selection(file, fh, sel);
421
+
return vivid_vid_cap_s_selection(file, priv, sel);
422
+
return vivid_vid_out_s_selection(file, priv, sel);
423
423
}
424
424
425
-
static int vidioc_g_parm(struct file *file, void *fh,
425
+
static int vidioc_g_parm(struct file *file, void *priv,
426
426
struct v4l2_streamparm *parm)
427
427
{
428
428
struct video_device *vdev = video_devdata(file);
429
429
430
430
if (vdev->vfl_type == VFL_TYPE_TOUCH)
431
-
return vivid_g_parm_tch(file, fh, parm);
431
+
return vivid_g_parm_tch(file, priv, parm);
432
432
if (vdev->vfl_dir == VFL_DIR_RX)
433
-
return vivid_vid_cap_g_parm(file, fh, parm);
434
-
return vivid_vid_out_g_parm(file, fh, parm);
433
+
return vivid_vid_cap_g_parm(file, priv, parm);
434
+
return vivid_vid_out_g_parm(file, priv, parm);
435
435
}
436
436
437
-
static int vidioc_s_parm(struct file *file, void *fh,
437
+
static int vidioc_s_parm(struct file *file, void *priv,
438
438
struct v4l2_streamparm *parm)
439
439
{
440
440
struct video_device *vdev = video_devdata(file);
441
441
442
442
if (vdev->vfl_dir == VFL_DIR_RX)
443
-
return vivid_vid_cap_s_parm(file, fh, parm);
443
+
return vivid_vid_cap_s_parm(file, priv, parm);
444
444
return -ENOTTY;
445
445
}
446
446
447
-
static int vidioc_log_status(struct file *file, void *fh)
447
+
static int vidioc_log_status(struct file *file, void *priv)
448
448
{
449
449
struct vivid_dev *dev = video_drvdata(file);
450
450
struct video_device *vdev = video_devdata(file);
451
451
452
-
v4l2_ctrl_log_status(file, fh);
452
+
v4l2_ctrl_log_status(file, priv);
453
453
if (vdev->vfl_dir == VFL_DIR_RX && vdev->vfl_type == VFL_TYPE_VIDEO)
454
454
tpg_log_status(&dev->tpg);
455
455
return 0;
+4
-4
drivers/media/test-drivers/vivid/vivid-radio-rx.c
+4
-4
drivers/media/test-drivers/vivid/vivid-radio-rx.c
···
133
133
return EPOLLIN | EPOLLRDNORM | v4l2_ctrl_poll(file, wait);
134
134
}
135
135
136
-
int vivid_radio_rx_enum_freq_bands(struct file *file, void *fh, struct v4l2_frequency_band *band)
136
+
int vivid_radio_rx_enum_freq_bands(struct file *file, void *priv, struct v4l2_frequency_band *band)
137
137
{
138
138
if (band->tuner != 0)
139
139
return -EINVAL;
···
145
145
return 0;
146
146
}
147
147
148
-
int vivid_radio_rx_s_hw_freq_seek(struct file *file, void *fh, const struct v4l2_hw_freq_seek *a)
148
+
int vivid_radio_rx_s_hw_freq_seek(struct file *file, void *priv, const struct v4l2_hw_freq_seek *a)
149
149
{
150
150
struct vivid_dev *dev = video_drvdata(file);
151
151
unsigned low, high;
···
214
214
return 0;
215
215
}
216
216
217
-
int vivid_radio_rx_g_tuner(struct file *file, void *fh, struct v4l2_tuner *vt)
217
+
int vivid_radio_rx_g_tuner(struct file *file, void *priv, struct v4l2_tuner *vt)
218
218
{
219
219
struct vivid_dev *dev = video_drvdata(file);
220
220
int delta = 800;
···
267
267
return 0;
268
268
}
269
269
270
-
int vivid_radio_rx_s_tuner(struct file *file, void *fh, const struct v4l2_tuner *vt)
270
+
int vivid_radio_rx_s_tuner(struct file *file, void *priv, const struct v4l2_tuner *vt)
271
271
{
272
272
struct vivid_dev *dev = video_drvdata(file);
273
273
+4
-4
drivers/media/test-drivers/vivid/vivid-radio-rx.h
+4
-4
drivers/media/test-drivers/vivid/vivid-radio-rx.h
···
11
11
ssize_t vivid_radio_rx_read(struct file *, char __user *, size_t, loff_t *);
12
12
__poll_t vivid_radio_rx_poll(struct file *file, struct poll_table_struct *wait);
13
13
14
-
int vivid_radio_rx_enum_freq_bands(struct file *file, void *fh, struct v4l2_frequency_band *band);
15
-
int vivid_radio_rx_s_hw_freq_seek(struct file *file, void *fh, const struct v4l2_hw_freq_seek *a);
16
-
int vivid_radio_rx_g_tuner(struct file *file, void *fh, struct v4l2_tuner *vt);
17
-
int vivid_radio_rx_s_tuner(struct file *file, void *fh, const struct v4l2_tuner *vt);
14
+
int vivid_radio_rx_enum_freq_bands(struct file *file, void *priv, struct v4l2_frequency_band *band);
15
+
int vivid_radio_rx_s_hw_freq_seek(struct file *file, void *priv, const struct v4l2_hw_freq_seek *a);
16
+
int vivid_radio_rx_g_tuner(struct file *file, void *priv, struct v4l2_tuner *vt);
17
+
int vivid_radio_rx_s_tuner(struct file *file, void *priv, const struct v4l2_tuner *vt);
18
18
19
19
#endif
+2
-2
drivers/media/test-drivers/vivid/vivid-radio-tx.c
+2
-2
drivers/media/test-drivers/vivid/vivid-radio-tx.c
···
96
96
return EPOLLOUT | EPOLLWRNORM | v4l2_ctrl_poll(file, wait);
97
97
}
98
98
99
-
int vidioc_g_modulator(struct file *file, void *fh, struct v4l2_modulator *a)
99
+
int vidioc_g_modulator(struct file *file, void *priv, struct v4l2_modulator *a)
100
100
{
101
101
struct vivid_dev *dev = video_drvdata(file);
102
102
···
115
115
return 0;
116
116
}
117
117
118
-
int vidioc_s_modulator(struct file *file, void *fh, const struct v4l2_modulator *a)
118
+
int vidioc_s_modulator(struct file *file, void *priv, const struct v4l2_modulator *a)
119
119
{
120
120
struct vivid_dev *dev = video_drvdata(file);
121
121
+2
-2
drivers/media/test-drivers/vivid/vivid-radio-tx.h
+2
-2
drivers/media/test-drivers/vivid/vivid-radio-tx.h
···
11
11
ssize_t vivid_radio_tx_write(struct file *, const char __user *, size_t, loff_t *);
12
12
__poll_t vivid_radio_tx_poll(struct file *file, struct poll_table_struct *wait);
13
13
14
-
int vidioc_g_modulator(struct file *file, void *fh, struct v4l2_modulator *a);
15
-
int vidioc_s_modulator(struct file *file, void *fh, const struct v4l2_modulator *a);
14
+
int vidioc_g_modulator(struct file *file, void *priv, struct v4l2_modulator *a);
15
+
int vidioc_s_modulator(struct file *file, void *priv, const struct v4l2_modulator *a);
16
16
17
17
#endif
+9
-9
drivers/media/test-drivers/vivid/vivid-sdr-cap.c
+9
-9
drivers/media/test-drivers/vivid/vivid-sdr-cap.c
···
344
344
.buf_request_complete = sdr_cap_buf_request_complete,
345
345
};
346
346
347
-
int vivid_sdr_enum_freq_bands(struct file *file, void *fh,
347
+
int vivid_sdr_enum_freq_bands(struct file *file, void *priv,
348
348
struct v4l2_frequency_band *band)
349
349
{
350
350
switch (band->tuner) {
···
363
363
}
364
364
}
365
365
366
-
int vivid_sdr_g_frequency(struct file *file, void *fh,
366
+
int vivid_sdr_g_frequency(struct file *file, void *priv,
367
367
struct v4l2_frequency *vf)
368
368
{
369
369
struct vivid_dev *dev = video_drvdata(file);
···
382
382
}
383
383
}
384
384
385
-
int vivid_sdr_s_frequency(struct file *file, void *fh,
385
+
int vivid_sdr_s_frequency(struct file *file, void *priv,
386
386
const struct v4l2_frequency *vf)
387
387
{
388
388
struct vivid_dev *dev = video_drvdata(file);
···
423
423
}
424
424
}
425
425
426
-
int vivid_sdr_g_tuner(struct file *file, void *fh, struct v4l2_tuner *vt)
426
+
int vivid_sdr_g_tuner(struct file *file, void *priv, struct v4l2_tuner *vt)
427
427
{
428
428
switch (vt->index) {
429
429
case 0:
···
447
447
}
448
448
}
449
449
450
-
int vivid_sdr_s_tuner(struct file *file, void *fh, const struct v4l2_tuner *vt)
450
+
int vivid_sdr_s_tuner(struct file *file, void *priv, const struct v4l2_tuner *vt)
451
451
{
452
452
if (vt->index > 1)
453
453
return -EINVAL;
454
454
return 0;
455
455
}
456
456
457
-
int vidioc_enum_fmt_sdr_cap(struct file *file, void *fh, struct v4l2_fmtdesc *f)
457
+
int vidioc_enum_fmt_sdr_cap(struct file *file, void *priv, struct v4l2_fmtdesc *f)
458
458
{
459
459
if (f->index >= ARRAY_SIZE(formats))
460
460
return -EINVAL;
···
462
462
return 0;
463
463
}
464
464
465
-
int vidioc_g_fmt_sdr_cap(struct file *file, void *fh, struct v4l2_format *f)
465
+
int vidioc_g_fmt_sdr_cap(struct file *file, void *priv, struct v4l2_format *f)
466
466
{
467
467
struct vivid_dev *dev = video_drvdata(file);
468
468
···
471
471
return 0;
472
472
}
473
473
474
-
int vidioc_s_fmt_sdr_cap(struct file *file, void *fh, struct v4l2_format *f)
474
+
int vidioc_s_fmt_sdr_cap(struct file *file, void *priv, struct v4l2_format *f)
475
475
{
476
476
struct vivid_dev *dev = video_drvdata(file);
477
477
struct vb2_queue *q = &dev->vb_sdr_cap_q;
···
495
495
return 0;
496
496
}
497
497
498
-
int vidioc_try_fmt_sdr_cap(struct file *file, void *fh, struct v4l2_format *f)
498
+
int vidioc_try_fmt_sdr_cap(struct file *file, void *priv, struct v4l2_format *f)
499
499
{
500
500
int i;
501
501
+9
-9
drivers/media/test-drivers/vivid/vivid-sdr-cap.h
+9
-9
drivers/media/test-drivers/vivid/vivid-sdr-cap.h
···
8
8
#ifndef _VIVID_SDR_CAP_H_
9
9
#define _VIVID_SDR_CAP_H_
10
10
11
-
int vivid_sdr_enum_freq_bands(struct file *file, void *fh, struct v4l2_frequency_band *band);
12
-
int vivid_sdr_g_frequency(struct file *file, void *fh, struct v4l2_frequency *vf);
13
-
int vivid_sdr_s_frequency(struct file *file, void *fh, const struct v4l2_frequency *vf);
14
-
int vivid_sdr_g_tuner(struct file *file, void *fh, struct v4l2_tuner *vt);
15
-
int vivid_sdr_s_tuner(struct file *file, void *fh, const struct v4l2_tuner *vt);
16
-
int vidioc_enum_fmt_sdr_cap(struct file *file, void *fh, struct v4l2_fmtdesc *f);
17
-
int vidioc_g_fmt_sdr_cap(struct file *file, void *fh, struct v4l2_format *f);
18
-
int vidioc_s_fmt_sdr_cap(struct file *file, void *fh, struct v4l2_format *f);
19
-
int vidioc_try_fmt_sdr_cap(struct file *file, void *fh, struct v4l2_format *f);
11
+
int vivid_sdr_enum_freq_bands(struct file *file, void *priv, struct v4l2_frequency_band *band);
12
+
int vivid_sdr_g_frequency(struct file *file, void *priv, struct v4l2_frequency *vf);
13
+
int vivid_sdr_s_frequency(struct file *file, void *priv, const struct v4l2_frequency *vf);
14
+
int vivid_sdr_g_tuner(struct file *file, void *priv, struct v4l2_tuner *vt);
15
+
int vivid_sdr_s_tuner(struct file *file, void *priv, const struct v4l2_tuner *vt);
16
+
int vidioc_enum_fmt_sdr_cap(struct file *file, void *priv, struct v4l2_fmtdesc *f);
17
+
int vidioc_g_fmt_sdr_cap(struct file *file, void *priv, struct v4l2_format *f);
18
+
int vidioc_s_fmt_sdr_cap(struct file *file, void *priv, struct v4l2_format *f);
19
+
int vidioc_try_fmt_sdr_cap(struct file *file, void *priv, struct v4l2_format *f);
20
20
void vivid_sdr_cap_process(struct vivid_dev *dev, struct vivid_buffer *buf);
21
21
22
22
extern const struct vb2_ops vivid_sdr_cap_qops;
+5
-5
drivers/media/test-drivers/vivid/vivid-vbi-cap.c
+5
-5
drivers/media/test-drivers/vivid/vivid-vbi-cap.c
···
282
282
}
283
283
}
284
284
285
-
int vidioc_g_fmt_sliced_vbi_cap(struct file *file, void *fh, struct v4l2_format *fmt)
285
+
int vidioc_g_fmt_sliced_vbi_cap(struct file *file, void *priv, struct v4l2_format *fmt)
286
286
{
287
287
struct vivid_dev *dev = video_drvdata(file);
288
288
struct v4l2_sliced_vbi_format *vbi = &fmt->fmt.sliced;
···
294
294
return 0;
295
295
}
296
296
297
-
int vidioc_try_fmt_sliced_vbi_cap(struct file *file, void *fh, struct v4l2_format *fmt)
297
+
int vidioc_try_fmt_sliced_vbi_cap(struct file *file, void *priv, struct v4l2_format *fmt)
298
298
{
299
299
struct vivid_dev *dev = video_drvdata(file);
300
300
struct v4l2_sliced_vbi_format *vbi = &fmt->fmt.sliced;
···
310
310
return 0;
311
311
}
312
312
313
-
int vidioc_s_fmt_sliced_vbi_cap(struct file *file, void *fh, struct v4l2_format *fmt)
313
+
int vidioc_s_fmt_sliced_vbi_cap(struct file *file, void *priv, struct v4l2_format *fmt)
314
314
{
315
315
struct vivid_dev *dev = video_drvdata(file);
316
316
struct v4l2_sliced_vbi_format *vbi = &fmt->fmt.sliced;
317
-
int ret = vidioc_try_fmt_sliced_vbi_cap(file, fh, fmt);
317
+
int ret = vidioc_try_fmt_sliced_vbi_cap(file, priv, fmt);
318
318
319
319
if (ret)
320
320
return ret;
···
324
324
return 0;
325
325
}
326
326
327
-
int vidioc_g_sliced_vbi_cap(struct file *file, void *fh, struct v4l2_sliced_vbi_cap *cap)
327
+
int vidioc_g_sliced_vbi_cap(struct file *file, void *priv, struct v4l2_sliced_vbi_cap *cap)
328
328
{
329
329
struct vivid_dev *dev = video_drvdata(file);
330
330
struct video_device *vdev = video_devdata(file);
+4
-4
drivers/media/test-drivers/vivid/vivid-vbi-cap.h
+4
-4
drivers/media/test-drivers/vivid/vivid-vbi-cap.h
···
16
16
struct v4l2_format *f);
17
17
int vidioc_s_fmt_vbi_cap(struct file *file, void *priv,
18
18
struct v4l2_format *f);
19
-
int vidioc_g_fmt_sliced_vbi_cap(struct file *file, void *fh, struct v4l2_format *fmt);
20
-
int vidioc_try_fmt_sliced_vbi_cap(struct file *file, void *fh, struct v4l2_format *fmt);
21
-
int vidioc_s_fmt_sliced_vbi_cap(struct file *file, void *fh, struct v4l2_format *fmt);
22
-
int vidioc_g_sliced_vbi_cap(struct file *file, void *fh, struct v4l2_sliced_vbi_cap *cap);
19
+
int vidioc_g_fmt_sliced_vbi_cap(struct file *file, void *priv, struct v4l2_format *fmt);
20
+
int vidioc_try_fmt_sliced_vbi_cap(struct file *file, void *priv, struct v4l2_format *fmt);
21
+
int vidioc_s_fmt_sliced_vbi_cap(struct file *file, void *priv, struct v4l2_format *fmt);
22
+
int vidioc_g_sliced_vbi_cap(struct file *file, void *priv, struct v4l2_sliced_vbi_cap *cap);
23
23
24
24
void vivid_fill_service_lines(struct v4l2_sliced_vbi_format *vbi, u32 service_set);
25
25
+4
-4
drivers/media/test-drivers/vivid/vivid-vbi-out.c
+4
-4
drivers/media/test-drivers/vivid/vivid-vbi-out.c
···
168
168
return 0;
169
169
}
170
170
171
-
int vidioc_g_fmt_sliced_vbi_out(struct file *file, void *fh, struct v4l2_format *fmt)
171
+
int vidioc_g_fmt_sliced_vbi_out(struct file *file, void *priv, struct v4l2_format *fmt)
172
172
{
173
173
struct vivid_dev *dev = video_drvdata(file);
174
174
struct v4l2_sliced_vbi_format *vbi = &fmt->fmt.sliced;
···
180
180
return 0;
181
181
}
182
182
183
-
int vidioc_try_fmt_sliced_vbi_out(struct file *file, void *fh, struct v4l2_format *fmt)
183
+
int vidioc_try_fmt_sliced_vbi_out(struct file *file, void *priv, struct v4l2_format *fmt)
184
184
{
185
185
struct vivid_dev *dev = video_drvdata(file);
186
186
struct v4l2_sliced_vbi_format *vbi = &fmt->fmt.sliced;
···
196
196
return 0;
197
197
}
198
198
199
-
int vidioc_s_fmt_sliced_vbi_out(struct file *file, void *fh,
199
+
int vidioc_s_fmt_sliced_vbi_out(struct file *file, void *priv,
200
200
struct v4l2_format *fmt)
201
201
{
202
202
struct vivid_dev *dev = video_drvdata(file);
203
203
struct v4l2_sliced_vbi_format *vbi = &fmt->fmt.sliced;
204
-
int ret = vidioc_try_fmt_sliced_vbi_out(file, fh, fmt);
204
+
int ret = vidioc_try_fmt_sliced_vbi_out(file, priv, fmt);
205
205
206
206
if (ret)
207
207
return ret;
+3
-3
drivers/media/test-drivers/vivid/vivid-vbi-out.h
+3
-3
drivers/media/test-drivers/vivid/vivid-vbi-out.h
···
13
13
struct v4l2_format *f);
14
14
int vidioc_s_fmt_vbi_out(struct file *file, void *priv,
15
15
struct v4l2_format *f);
16
-
int vidioc_g_fmt_sliced_vbi_out(struct file *file, void *fh, struct v4l2_format *fmt);
17
-
int vidioc_try_fmt_sliced_vbi_out(struct file *file, void *fh, struct v4l2_format *fmt);
18
-
int vidioc_s_fmt_sliced_vbi_out(struct file *file, void *fh, struct v4l2_format *fmt);
16
+
int vidioc_g_fmt_sliced_vbi_out(struct file *file, void *priv, struct v4l2_format *fmt);
17
+
int vidioc_try_fmt_sliced_vbi_out(struct file *file, void *priv, struct v4l2_format *fmt);
18
+
int vidioc_s_fmt_sliced_vbi_out(struct file *file, void *priv, struct v4l2_format *fmt);
19
19
20
20
extern const struct vb2_ops vivid_vbi_out_qops;
21
21
+12
-12
drivers/media/test-drivers/vivid/vivid-vid-cap.c
+12
-12
drivers/media/test-drivers/vivid/vivid-vid-cap.c
···
899
899
return 0;
900
900
}
901
901
902
-
int vivid_vid_cap_s_selection(struct file *file, void *fh, struct v4l2_selection *s)
902
+
int vivid_vid_cap_s_selection(struct file *file, void *priv, struct v4l2_selection *s)
903
903
{
904
904
struct vivid_dev *dev = video_drvdata(file);
905
905
struct v4l2_rect *crop = &dev->crop_cap;
···
1222
1222
return 0;
1223
1223
}
1224
1224
1225
-
int vidioc_enumaudio(struct file *file, void *fh, struct v4l2_audio *vin)
1225
+
int vidioc_enumaudio(struct file *file, void *priv, struct v4l2_audio *vin)
1226
1226
{
1227
1227
if (vin->index >= ARRAY_SIZE(vivid_audio_inputs))
1228
1228
return -EINVAL;
···
1230
1230
return 0;
1231
1231
}
1232
1232
1233
-
int vidioc_g_audio(struct file *file, void *fh, struct v4l2_audio *vin)
1233
+
int vidioc_g_audio(struct file *file, void *priv, struct v4l2_audio *vin)
1234
1234
{
1235
1235
struct vivid_dev *dev = video_drvdata(file);
1236
1236
···
1240
1240
return 0;
1241
1241
}
1242
1242
1243
-
int vidioc_s_audio(struct file *file, void *fh, const struct v4l2_audio *vin)
1243
+
int vidioc_s_audio(struct file *file, void *priv, const struct v4l2_audio *vin)
1244
1244
{
1245
1245
struct vivid_dev *dev = video_drvdata(file);
1246
1246
···
1252
1252
return 0;
1253
1253
}
1254
1254
1255
-
int vivid_video_g_frequency(struct file *file, void *fh, struct v4l2_frequency *vf)
1255
+
int vivid_video_g_frequency(struct file *file, void *priv, struct v4l2_frequency *vf)
1256
1256
{
1257
1257
struct vivid_dev *dev = video_drvdata(file);
1258
1258
···
1262
1262
return 0;
1263
1263
}
1264
1264
1265
-
int vivid_video_s_frequency(struct file *file, void *fh, const struct v4l2_frequency *vf)
1265
+
int vivid_video_s_frequency(struct file *file, void *priv, const struct v4l2_frequency *vf)
1266
1266
{
1267
1267
struct vivid_dev *dev = video_drvdata(file);
1268
1268
···
1274
1274
return 0;
1275
1275
}
1276
1276
1277
-
int vivid_video_s_tuner(struct file *file, void *fh, const struct v4l2_tuner *vt)
1277
+
int vivid_video_s_tuner(struct file *file, void *priv, const struct v4l2_tuner *vt)
1278
1278
{
1279
1279
struct vivid_dev *dev = video_drvdata(file);
1280
1280
···
1286
1286
return 0;
1287
1287
}
1288
1288
1289
-
int vivid_video_g_tuner(struct file *file, void *fh, struct v4l2_tuner *vt)
1289
+
int vivid_video_g_tuner(struct file *file, void *priv, struct v4l2_tuner *vt)
1290
1290
{
1291
1291
struct vivid_dev *dev = video_drvdata(file);
1292
1292
enum tpg_quality qual;
···
1490
1490
return false;
1491
1491
}
1492
1492
1493
-
int vivid_vid_cap_s_dv_timings(struct file *file, void *_fh,
1493
+
int vivid_vid_cap_s_dv_timings(struct file *file, void *priv,
1494
1494
struct v4l2_dv_timings *timings)
1495
1495
{
1496
1496
struct vivid_dev *dev = video_drvdata(file);
···
1513
1513
return 0;
1514
1514
}
1515
1515
1516
-
int vidioc_query_dv_timings(struct file *file, void *_fh,
1516
+
int vidioc_query_dv_timings(struct file *file, void *priv,
1517
1517
struct v4l2_dv_timings *timings)
1518
1518
{
1519
1519
struct vivid_dev *dev = video_drvdata(file);
···
1600
1600
}
1601
1601
}
1602
1602
1603
-
int vidioc_s_edid(struct file *file, void *_fh,
1603
+
int vidioc_s_edid(struct file *file, void *priv,
1604
1604
struct v4l2_edid *edid)
1605
1605
{
1606
1606
struct vivid_dev *dev = video_drvdata(file);
···
1638
1638
return 0;
1639
1639
}
1640
1640
1641
-
int vidioc_enum_framesizes(struct file *file, void *fh,
1641
+
int vidioc_enum_framesizes(struct file *file, void *priv,
1642
1642
struct v4l2_frmsizeenum *fsize)
1643
1643
{
1644
1644
struct vivid_dev *dev = video_drvdata(file);
+12
-12
drivers/media/test-drivers/vivid/vivid-vid-cap.h
+12
-12
drivers/media/test-drivers/vivid/vivid-vid-cap.h
···
29
29
int vidioc_try_fmt_vid_cap(struct file *file, void *priv, struct v4l2_format *f);
30
30
int vidioc_s_fmt_vid_cap(struct file *file, void *priv, struct v4l2_format *f);
31
31
int vivid_vid_cap_g_selection(struct file *file, void *priv, struct v4l2_selection *sel);
32
-
int vivid_vid_cap_s_selection(struct file *file, void *fh, struct v4l2_selection *s);
32
+
int vivid_vid_cap_s_selection(struct file *file, void *priv, struct v4l2_selection *s);
33
33
int vivid_vid_cap_g_pixelaspect(struct file *file, void *priv, int type, struct v4l2_fract *f);
34
34
int vidioc_enum_fmt_vid_overlay(struct file *file, void *priv, struct v4l2_fmtdesc *f);
35
35
int vidioc_g_fmt_vid_overlay(struct file *file, void *priv, struct v4l2_format *f);
···
38
38
int vidioc_enum_input(struct file *file, void *priv, struct v4l2_input *inp);
39
39
int vidioc_g_input(struct file *file, void *priv, unsigned *i);
40
40
int vidioc_s_input(struct file *file, void *priv, unsigned i);
41
-
int vidioc_enumaudio(struct file *file, void *fh, struct v4l2_audio *vin);
42
-
int vidioc_g_audio(struct file *file, void *fh, struct v4l2_audio *vin);
43
-
int vidioc_s_audio(struct file *file, void *fh, const struct v4l2_audio *vin);
44
-
int vivid_video_g_frequency(struct file *file, void *fh, struct v4l2_frequency *vf);
45
-
int vivid_video_s_frequency(struct file *file, void *fh, const struct v4l2_frequency *vf);
46
-
int vivid_video_s_tuner(struct file *file, void *fh, const struct v4l2_tuner *vt);
47
-
int vivid_video_g_tuner(struct file *file, void *fh, struct v4l2_tuner *vt);
41
+
int vidioc_enumaudio(struct file *file, void *priv, struct v4l2_audio *vin);
42
+
int vidioc_g_audio(struct file *file, void *priv, struct v4l2_audio *vin);
43
+
int vidioc_s_audio(struct file *file, void *priv, const struct v4l2_audio *vin);
44
+
int vivid_video_g_frequency(struct file *file, void *priv, struct v4l2_frequency *vf);
45
+
int vivid_video_s_frequency(struct file *file, void *priv, const struct v4l2_frequency *vf);
46
+
int vivid_video_s_tuner(struct file *file, void *priv, const struct v4l2_tuner *vt);
47
+
int vivid_video_g_tuner(struct file *file, void *priv, struct v4l2_tuner *vt);
48
48
int vidioc_querystd(struct file *file, void *priv, v4l2_std_id *id);
49
49
int vivid_vid_cap_s_std(struct file *file, void *priv, v4l2_std_id id);
50
-
int vivid_vid_cap_s_dv_timings(struct file *file, void *_fh, struct v4l2_dv_timings *timings);
51
-
int vidioc_query_dv_timings(struct file *file, void *_fh, struct v4l2_dv_timings *timings);
52
-
int vidioc_s_edid(struct file *file, void *_fh, struct v4l2_edid *edid);
53
-
int vidioc_enum_framesizes(struct file *file, void *fh, struct v4l2_frmsizeenum *fsize);
50
+
int vivid_vid_cap_s_dv_timings(struct file *file, void *priv, struct v4l2_dv_timings *timings);
51
+
int vidioc_query_dv_timings(struct file *file, void *priv, struct v4l2_dv_timings *timings);
52
+
int vidioc_s_edid(struct file *file, void *priv, struct v4l2_edid *edid);
53
+
int vidioc_enum_framesizes(struct file *file, void *priv, struct v4l2_frmsizeenum *fsize);
54
54
int vidioc_enum_frameintervals(struct file *file, void *priv, struct v4l2_frmivalenum *fival);
55
55
int vivid_vid_cap_g_parm(struct file *file, void *priv, struct v4l2_streamparm *parm);
56
56
int vivid_vid_cap_s_parm(struct file *file, void *priv, struct v4l2_streamparm *parm);
+4
-4
drivers/media/test-drivers/vivid/vivid-vid-common.c
+4
-4
drivers/media/test-drivers/vivid/vivid-vid-common.c
···
1021
1021
return 0;
1022
1022
}
1023
1023
1024
-
int vidioc_g_dv_timings(struct file *file, void *_fh,
1024
+
int vidioc_g_dv_timings(struct file *file, void *priv,
1025
1025
struct v4l2_dv_timings *timings)
1026
1026
{
1027
1027
struct vivid_dev *dev = video_drvdata(file);
···
1039
1039
return 0;
1040
1040
}
1041
1041
1042
-
int vidioc_enum_dv_timings(struct file *file, void *_fh,
1042
+
int vidioc_enum_dv_timings(struct file *file, void *priv,
1043
1043
struct v4l2_enum_dv_timings *timings)
1044
1044
{
1045
1045
struct vivid_dev *dev = video_drvdata(file);
···
1056
1056
NULL, NULL);
1057
1057
}
1058
1058
1059
-
int vidioc_dv_timings_cap(struct file *file, void *_fh,
1059
+
int vidioc_dv_timings_cap(struct file *file, void *priv,
1060
1060
struct v4l2_dv_timings_cap *cap)
1061
1061
{
1062
1062
struct vivid_dev *dev = video_drvdata(file);
···
1073
1073
return 0;
1074
1074
}
1075
1075
1076
-
int vidioc_g_edid(struct file *file, void *_fh,
1076
+
int vidioc_g_edid(struct file *file, void *priv,
1077
1077
struct v4l2_edid *edid)
1078
1078
{
1079
1079
struct vivid_dev *dev = video_drvdata(file);
+4
-4
drivers/media/test-drivers/vivid/vivid-vid-common.h
+4
-4
drivers/media/test-drivers/vivid/vivid-vid-common.h
···
32
32
33
33
int vivid_enum_fmt_vid(struct file *file, void *priv, struct v4l2_fmtdesc *f);
34
34
int vidioc_g_std(struct file *file, void *priv, v4l2_std_id *id);
35
-
int vidioc_g_dv_timings(struct file *file, void *_fh, struct v4l2_dv_timings *timings);
36
-
int vidioc_enum_dv_timings(struct file *file, void *_fh, struct v4l2_enum_dv_timings *timings);
37
-
int vidioc_dv_timings_cap(struct file *file, void *_fh, struct v4l2_dv_timings_cap *cap);
38
-
int vidioc_g_edid(struct file *file, void *_fh, struct v4l2_edid *edid);
35
+
int vidioc_g_dv_timings(struct file *file, void *priv, struct v4l2_dv_timings *timings);
36
+
int vidioc_enum_dv_timings(struct file *file, void *priv, struct v4l2_enum_dv_timings *timings);
37
+
int vidioc_dv_timings_cap(struct file *file, void *priv, struct v4l2_dv_timings_cap *cap);
38
+
int vidioc_g_edid(struct file *file, void *priv, struct v4l2_edid *edid);
39
39
int vidioc_subscribe_event(struct v4l2_fh *fh, const struct v4l2_event_subscription *sub);
40
40
41
41
#endif
+8
-8
drivers/media/test-drivers/vivid/vivid-vid-out.c
+8
-8
drivers/media/test-drivers/vivid/vivid-vid-out.c
···
672
672
return 0;
673
673
}
674
674
675
-
int vivid_vid_out_s_selection(struct file *file, void *fh, struct v4l2_selection *s)
675
+
int vivid_vid_out_s_selection(struct file *file, void *priv, struct v4l2_selection *s)
676
676
{
677
677
struct vivid_dev *dev = video_drvdata(file);
678
678
struct v4l2_rect *crop = &dev->crop_out;
···
880
880
return ret;
881
881
}
882
882
883
-
int vivid_vid_out_overlay(struct file *file, void *fh, unsigned i)
883
+
int vivid_vid_out_overlay(struct file *file, void *priv, unsigned i)
884
884
{
885
885
struct vivid_dev *dev = video_drvdata(file);
886
886
···
893
893
return 0;
894
894
}
895
895
896
-
int vivid_vid_out_g_fbuf(struct file *file, void *fh,
896
+
int vivid_vid_out_g_fbuf(struct file *file, void *priv,
897
897
struct v4l2_framebuffer *a)
898
898
{
899
899
struct vivid_dev *dev = video_drvdata(file);
···
920
920
return 0;
921
921
}
922
922
923
-
int vivid_vid_out_s_fbuf(struct file *file, void *fh,
923
+
int vivid_vid_out_s_fbuf(struct file *file, void *priv,
924
924
const struct v4l2_framebuffer *a)
925
925
{
926
926
struct vivid_dev *dev = video_drvdata(file);
···
1016
1016
return 0;
1017
1017
}
1018
1018
1019
-
int vidioc_enumaudout(struct file *file, void *fh, struct v4l2_audioout *vout)
1019
+
int vidioc_enumaudout(struct file *file, void *priv, struct v4l2_audioout *vout)
1020
1020
{
1021
1021
if (vout->index >= ARRAY_SIZE(vivid_audio_outputs))
1022
1022
return -EINVAL;
···
1024
1024
return 0;
1025
1025
}
1026
1026
1027
-
int vidioc_g_audout(struct file *file, void *fh, struct v4l2_audioout *vout)
1027
+
int vidioc_g_audout(struct file *file, void *priv, struct v4l2_audioout *vout)
1028
1028
{
1029
1029
struct vivid_dev *dev = video_drvdata(file);
1030
1030
···
1034
1034
return 0;
1035
1035
}
1036
1036
1037
-
int vidioc_s_audout(struct file *file, void *fh, const struct v4l2_audioout *vout)
1037
+
int vidioc_s_audout(struct file *file, void *priv, const struct v4l2_audioout *vout)
1038
1038
{
1039
1039
struct vivid_dev *dev = video_drvdata(file);
1040
1040
···
1072
1072
return false;
1073
1073
}
1074
1074
1075
-
int vivid_vid_out_s_dv_timings(struct file *file, void *_fh,
1075
+
int vivid_vid_out_s_dv_timings(struct file *file, void *priv,
1076
1076
struct v4l2_dv_timings *timings)
1077
1077
{
1078
1078
struct vivid_dev *dev = video_drvdata(file);
+8
-8
drivers/media/test-drivers/vivid/vivid-vid-out.h
+8
-8
drivers/media/test-drivers/vivid/vivid-vid-out.h
···
22
22
int vidioc_try_fmt_vid_out(struct file *file, void *priv, struct v4l2_format *f);
23
23
int vidioc_s_fmt_vid_out(struct file *file, void *priv, struct v4l2_format *f);
24
24
int vivid_vid_out_g_selection(struct file *file, void *priv, struct v4l2_selection *sel);
25
-
int vivid_vid_out_s_selection(struct file *file, void *fh, struct v4l2_selection *s);
25
+
int vivid_vid_out_s_selection(struct file *file, void *priv, struct v4l2_selection *s);
26
26
int vivid_vid_out_g_pixelaspect(struct file *file, void *priv, int type, struct v4l2_fract *f);
27
27
int vidioc_enum_fmt_vid_out_overlay(struct file *file, void *priv, struct v4l2_fmtdesc *f);
28
28
int vidioc_g_fmt_vid_out_overlay(struct file *file, void *priv, struct v4l2_format *f);
29
29
int vidioc_try_fmt_vid_out_overlay(struct file *file, void *priv, struct v4l2_format *f);
30
30
int vidioc_s_fmt_vid_out_overlay(struct file *file, void *priv, struct v4l2_format *f);
31
-
int vivid_vid_out_overlay(struct file *file, void *fh, unsigned i);
32
-
int vivid_vid_out_g_fbuf(struct file *file, void *fh, struct v4l2_framebuffer *a);
33
-
int vivid_vid_out_s_fbuf(struct file *file, void *fh, const struct v4l2_framebuffer *a);
31
+
int vivid_vid_out_overlay(struct file *file, void *priv, unsigned i);
32
+
int vivid_vid_out_g_fbuf(struct file *file, void *priv, struct v4l2_framebuffer *a);
33
+
int vivid_vid_out_s_fbuf(struct file *file, void *priv, const struct v4l2_framebuffer *a);
34
34
int vidioc_enum_output(struct file *file, void *priv, struct v4l2_output *out);
35
35
int vidioc_g_output(struct file *file, void *priv, unsigned *i);
36
36
int vidioc_s_output(struct file *file, void *priv, unsigned i);
37
-
int vidioc_enumaudout(struct file *file, void *fh, struct v4l2_audioout *vout);
38
-
int vidioc_g_audout(struct file *file, void *fh, struct v4l2_audioout *vout);
39
-
int vidioc_s_audout(struct file *file, void *fh, const struct v4l2_audioout *vout);
37
+
int vidioc_enumaudout(struct file *file, void *priv, struct v4l2_audioout *vout);
38
+
int vidioc_g_audout(struct file *file, void *priv, struct v4l2_audioout *vout);
39
+
int vidioc_s_audout(struct file *file, void *priv, const struct v4l2_audioout *vout);
40
40
int vivid_vid_out_s_std(struct file *file, void *priv, v4l2_std_id id);
41
-
int vivid_vid_out_s_dv_timings(struct file *file, void *_fh, struct v4l2_dv_timings *timings);
41
+
int vivid_vid_out_s_dv_timings(struct file *file, void *priv, struct v4l2_dv_timings *timings);
42
42
int vivid_vid_out_g_parm(struct file *file, void *priv, struct v4l2_streamparm *parm);
43
43
44
44
#endif