tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

media: v4l2-ioctl: Stop passing fh pointer to ioctl handlers

Now that all drivers access the v4l2_fh from the file structure, there
is no need to pass it as an explicit argument to ioctl handlers. Set the
argument to NULL in the __video_do_ioctl() function, and rename the 'fh'
argument in the ioctl handler declarations to 'priv' indicate it does
not contain a file handle.

The argument could be removed altogether with a mechanical change
(probably using coccinelle), but there are plans to pass a new argument
to the ioctl handlers in the near future. The tree-wide change to remove
the argument, only to add another one soon after, would be too much
churn.

While at it, fix argument alignment in vidioc_try_fmt_vid_out_overlay().

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 0f1a7fac d2683099

+122 -122
+1 -1
drivers/media/v4l2-core/v4l2-compat-ioctl32.c
··· 691 691 if (!ops || !ops->vidioc_query_ext_ctrl) 692 692 return false; 693 693 694 - return !ops->vidioc_query_ext_ctrl(file, fh, &qec) && 694 + return !ops->vidioc_query_ext_ctrl(file, NULL, &qec) && 695 695 (qec.flags & V4L2_CTRL_FLAG_HAS_PAYLOAD); 696 696 } 697 697
+2 -2
drivers/media/v4l2-core/v4l2-ioctl.c
··· 3126 3126 3127 3127 write_only = _IOC_DIR(cmd) == _IOC_WRITE; 3128 3128 if (info != &default_info) { 3129 - ret = info->func(ops, file, vfh, arg); 3129 + ret = info->func(ops, file, NULL, arg); 3130 3130 } else if (!ops->vidioc_default) { 3131 3131 ret = -ENOTTY; 3132 3132 } else { 3133 - ret = ops->vidioc_default(file, vfh, 3133 + ret = ops->vidioc_default(file, NULL, 3134 3134 v4l2_prio_check(vfd->prio, vfh->prio) >= 0, 3135 3135 cmd, arg); 3136 3136 }
+119 -119
include/media/v4l2-ioctl.h
··· 293 293 /* ioctl callbacks */ 294 294 295 295 /* VIDIOC_QUERYCAP handler */ 296 - int (*vidioc_querycap)(struct file *file, void *fh, 296 + int (*vidioc_querycap)(struct file *file, void *priv, 297 297 struct v4l2_capability *cap); 298 298 299 299 /* VIDIOC_ENUM_FMT handlers */ 300 - int (*vidioc_enum_fmt_vid_cap)(struct file *file, void *fh, 300 + int (*vidioc_enum_fmt_vid_cap)(struct file *file, void *priv, 301 301 struct v4l2_fmtdesc *f); 302 - int (*vidioc_enum_fmt_vid_overlay)(struct file *file, void *fh, 302 + int (*vidioc_enum_fmt_vid_overlay)(struct file *file, void *priv, 303 303 struct v4l2_fmtdesc *f); 304 - int (*vidioc_enum_fmt_vid_out)(struct file *file, void *fh, 304 + int (*vidioc_enum_fmt_vid_out)(struct file *file, void *priv, 305 305 struct v4l2_fmtdesc *f); 306 - int (*vidioc_enum_fmt_sdr_cap)(struct file *file, void *fh, 306 + int (*vidioc_enum_fmt_sdr_cap)(struct file *file, void *priv, 307 307 struct v4l2_fmtdesc *f); 308 - int (*vidioc_enum_fmt_sdr_out)(struct file *file, void *fh, 308 + int (*vidioc_enum_fmt_sdr_out)(struct file *file, void *priv, 309 309 struct v4l2_fmtdesc *f); 310 - int (*vidioc_enum_fmt_meta_cap)(struct file *file, void *fh, 310 + int (*vidioc_enum_fmt_meta_cap)(struct file *file, void *priv, 311 311 struct v4l2_fmtdesc *f); 312 - int (*vidioc_enum_fmt_meta_out)(struct file *file, void *fh, 312 + int (*vidioc_enum_fmt_meta_out)(struct file *file, void *priv, 313 313 struct v4l2_fmtdesc *f); 314 314 315 315 /* VIDIOC_G_FMT handlers */ 316 - int (*vidioc_g_fmt_vid_cap)(struct file *file, void *fh, 316 + int (*vidioc_g_fmt_vid_cap)(struct file *file, void *priv, 317 317 struct v4l2_format *f); 318 - int (*vidioc_g_fmt_vid_overlay)(struct file *file, void *fh, 318 + int (*vidioc_g_fmt_vid_overlay)(struct file *file, void *priv, 319 319 struct v4l2_format *f); 320 - int (*vidioc_g_fmt_vid_out)(struct file *file, void *fh, 320 + int (*vidioc_g_fmt_vid_out)(struct file *file, void *priv, 321 321 struct v4l2_format *f); 322 - int (*vidioc_g_fmt_vid_out_overlay)(struct file *file, void *fh, 322 + int (*vidioc_g_fmt_vid_out_overlay)(struct file *file, void *priv, 323 323 struct v4l2_format *f); 324 - int (*vidioc_g_fmt_vbi_cap)(struct file *file, void *fh, 324 + int (*vidioc_g_fmt_vbi_cap)(struct file *file, void *priv, 325 325 struct v4l2_format *f); 326 - int (*vidioc_g_fmt_vbi_out)(struct file *file, void *fh, 326 + int (*vidioc_g_fmt_vbi_out)(struct file *file, void *priv, 327 327 struct v4l2_format *f); 328 - int (*vidioc_g_fmt_sliced_vbi_cap)(struct file *file, void *fh, 328 + int (*vidioc_g_fmt_sliced_vbi_cap)(struct file *file, void *priv, 329 329 struct v4l2_format *f); 330 - int (*vidioc_g_fmt_sliced_vbi_out)(struct file *file, void *fh, 330 + int (*vidioc_g_fmt_sliced_vbi_out)(struct file *file, void *priv, 331 331 struct v4l2_format *f); 332 - int (*vidioc_g_fmt_vid_cap_mplane)(struct file *file, void *fh, 332 + int (*vidioc_g_fmt_vid_cap_mplane)(struct file *file, void *priv, 333 333 struct v4l2_format *f); 334 - int (*vidioc_g_fmt_vid_out_mplane)(struct file *file, void *fh, 334 + int (*vidioc_g_fmt_vid_out_mplane)(struct file *file, void *priv, 335 335 struct v4l2_format *f); 336 - int (*vidioc_g_fmt_sdr_cap)(struct file *file, void *fh, 336 + int (*vidioc_g_fmt_sdr_cap)(struct file *file, void *priv, 337 337 struct v4l2_format *f); 338 - int (*vidioc_g_fmt_sdr_out)(struct file *file, void *fh, 338 + int (*vidioc_g_fmt_sdr_out)(struct file *file, void *priv, 339 339 struct v4l2_format *f); 340 - int (*vidioc_g_fmt_meta_cap)(struct file *file, void *fh, 340 + int (*vidioc_g_fmt_meta_cap)(struct file *file, void *priv, 341 341 struct v4l2_format *f); 342 - int (*vidioc_g_fmt_meta_out)(struct file *file, void *fh, 342 + int (*vidioc_g_fmt_meta_out)(struct file *file, void *priv, 343 343 struct v4l2_format *f); 344 344 345 345 /* VIDIOC_S_FMT handlers */ 346 - int (*vidioc_s_fmt_vid_cap)(struct file *file, void *fh, 346 + int (*vidioc_s_fmt_vid_cap)(struct file *file, void *priv, 347 347 struct v4l2_format *f); 348 - int (*vidioc_s_fmt_vid_overlay)(struct file *file, void *fh, 348 + int (*vidioc_s_fmt_vid_overlay)(struct file *file, void *priv, 349 349 struct v4l2_format *f); 350 - int (*vidioc_s_fmt_vid_out)(struct file *file, void *fh, 350 + int (*vidioc_s_fmt_vid_out)(struct file *file, void *priv, 351 351 struct v4l2_format *f); 352 - int (*vidioc_s_fmt_vid_out_overlay)(struct file *file, void *fh, 352 + int (*vidioc_s_fmt_vid_out_overlay)(struct file *file, void *priv, 353 353 struct v4l2_format *f); 354 - int (*vidioc_s_fmt_vbi_cap)(struct file *file, void *fh, 354 + int (*vidioc_s_fmt_vbi_cap)(struct file *file, void *priv, 355 355 struct v4l2_format *f); 356 - int (*vidioc_s_fmt_vbi_out)(struct file *file, void *fh, 356 + int (*vidioc_s_fmt_vbi_out)(struct file *file, void *priv, 357 357 struct v4l2_format *f); 358 - int (*vidioc_s_fmt_sliced_vbi_cap)(struct file *file, void *fh, 358 + int (*vidioc_s_fmt_sliced_vbi_cap)(struct file *file, void *priv, 359 359 struct v4l2_format *f); 360 - int (*vidioc_s_fmt_sliced_vbi_out)(struct file *file, void *fh, 360 + int (*vidioc_s_fmt_sliced_vbi_out)(struct file *file, void *priv, 361 361 struct v4l2_format *f); 362 - int (*vidioc_s_fmt_vid_cap_mplane)(struct file *file, void *fh, 362 + int (*vidioc_s_fmt_vid_cap_mplane)(struct file *file, void *priv, 363 363 struct v4l2_format *f); 364 - int (*vidioc_s_fmt_vid_out_mplane)(struct file *file, void *fh, 364 + int (*vidioc_s_fmt_vid_out_mplane)(struct file *file, void *priv, 365 365 struct v4l2_format *f); 366 - int (*vidioc_s_fmt_sdr_cap)(struct file *file, void *fh, 366 + int (*vidioc_s_fmt_sdr_cap)(struct file *file, void *priv, 367 367 struct v4l2_format *f); 368 - int (*vidioc_s_fmt_sdr_out)(struct file *file, void *fh, 368 + int (*vidioc_s_fmt_sdr_out)(struct file *file, void *priv, 369 369 struct v4l2_format *f); 370 - int (*vidioc_s_fmt_meta_cap)(struct file *file, void *fh, 370 + int (*vidioc_s_fmt_meta_cap)(struct file *file, void *priv, 371 371 struct v4l2_format *f); 372 - int (*vidioc_s_fmt_meta_out)(struct file *file, void *fh, 372 + int (*vidioc_s_fmt_meta_out)(struct file *file, void *priv, 373 373 struct v4l2_format *f); 374 374 375 375 /* VIDIOC_TRY_FMT handlers */ 376 - int (*vidioc_try_fmt_vid_cap)(struct file *file, void *fh, 376 + int (*vidioc_try_fmt_vid_cap)(struct file *file, void *priv, 377 377 struct v4l2_format *f); 378 - int (*vidioc_try_fmt_vid_overlay)(struct file *file, void *fh, 378 + int (*vidioc_try_fmt_vid_overlay)(struct file *file, void *priv, 379 379 struct v4l2_format *f); 380 - int (*vidioc_try_fmt_vid_out)(struct file *file, void *fh, 380 + int (*vidioc_try_fmt_vid_out)(struct file *file, void *priv, 381 381 struct v4l2_format *f); 382 - int (*vidioc_try_fmt_vid_out_overlay)(struct file *file, void *fh, 383 - struct v4l2_format *f); 384 - int (*vidioc_try_fmt_vbi_cap)(struct file *file, void *fh, 382 + int (*vidioc_try_fmt_vid_out_overlay)(struct file *file, void *priv, 383 + struct v4l2_format *f); 384 + int (*vidioc_try_fmt_vbi_cap)(struct file *file, void *priv, 385 385 struct v4l2_format *f); 386 - int (*vidioc_try_fmt_vbi_out)(struct file *file, void *fh, 386 + int (*vidioc_try_fmt_vbi_out)(struct file *file, void *priv, 387 387 struct v4l2_format *f); 388 - int (*vidioc_try_fmt_sliced_vbi_cap)(struct file *file, void *fh, 388 + int (*vidioc_try_fmt_sliced_vbi_cap)(struct file *file, void *priv, 389 389 struct v4l2_format *f); 390 - int (*vidioc_try_fmt_sliced_vbi_out)(struct file *file, void *fh, 390 + int (*vidioc_try_fmt_sliced_vbi_out)(struct file *file, void *priv, 391 391 struct v4l2_format *f); 392 - int (*vidioc_try_fmt_vid_cap_mplane)(struct file *file, void *fh, 392 + int (*vidioc_try_fmt_vid_cap_mplane)(struct file *file, void *priv, 393 393 struct v4l2_format *f); 394 - int (*vidioc_try_fmt_vid_out_mplane)(struct file *file, void *fh, 394 + int (*vidioc_try_fmt_vid_out_mplane)(struct file *file, void *priv, 395 395 struct v4l2_format *f); 396 - int (*vidioc_try_fmt_sdr_cap)(struct file *file, void *fh, 396 + int (*vidioc_try_fmt_sdr_cap)(struct file *file, void *priv, 397 397 struct v4l2_format *f); 398 - int (*vidioc_try_fmt_sdr_out)(struct file *file, void *fh, 398 + int (*vidioc_try_fmt_sdr_out)(struct file *file, void *priv, 399 399 struct v4l2_format *f); 400 - int (*vidioc_try_fmt_meta_cap)(struct file *file, void *fh, 400 + int (*vidioc_try_fmt_meta_cap)(struct file *file, void *priv, 401 401 struct v4l2_format *f); 402 - int (*vidioc_try_fmt_meta_out)(struct file *file, void *fh, 402 + int (*vidioc_try_fmt_meta_out)(struct file *file, void *priv, 403 403 struct v4l2_format *f); 404 404 405 405 /* Buffer handlers */ 406 - int (*vidioc_reqbufs)(struct file *file, void *fh, 406 + int (*vidioc_reqbufs)(struct file *file, void *priv, 407 407 struct v4l2_requestbuffers *b); 408 - int (*vidioc_querybuf)(struct file *file, void *fh, 408 + int (*vidioc_querybuf)(struct file *file, void *priv, 409 409 struct v4l2_buffer *b); 410 - int (*vidioc_qbuf)(struct file *file, void *fh, 410 + int (*vidioc_qbuf)(struct file *file, void *priv, 411 411 struct v4l2_buffer *b); 412 - int (*vidioc_expbuf)(struct file *file, void *fh, 412 + int (*vidioc_expbuf)(struct file *file, void *priv, 413 413 struct v4l2_exportbuffer *e); 414 - int (*vidioc_dqbuf)(struct file *file, void *fh, 414 + int (*vidioc_dqbuf)(struct file *file, void *priv, 415 415 struct v4l2_buffer *b); 416 416 417 - int (*vidioc_create_bufs)(struct file *file, void *fh, 417 + int (*vidioc_create_bufs)(struct file *file, void *priv, 418 418 struct v4l2_create_buffers *b); 419 - int (*vidioc_prepare_buf)(struct file *file, void *fh, 419 + int (*vidioc_prepare_buf)(struct file *file, void *priv, 420 420 struct v4l2_buffer *b); 421 - int (*vidioc_remove_bufs)(struct file *file, void *fh, 421 + int (*vidioc_remove_bufs)(struct file *file, void *priv, 422 422 struct v4l2_remove_buffers *d); 423 423 424 - int (*vidioc_overlay)(struct file *file, void *fh, unsigned int i); 425 - int (*vidioc_g_fbuf)(struct file *file, void *fh, 424 + int (*vidioc_overlay)(struct file *file, void *priv, unsigned int i); 425 + int (*vidioc_g_fbuf)(struct file *file, void *priv, 426 426 struct v4l2_framebuffer *a); 427 - int (*vidioc_s_fbuf)(struct file *file, void *fh, 427 + int (*vidioc_s_fbuf)(struct file *file, void *priv, 428 428 const struct v4l2_framebuffer *a); 429 429 430 430 /* Stream on/off */ 431 - int (*vidioc_streamon)(struct file *file, void *fh, 431 + int (*vidioc_streamon)(struct file *file, void *priv, 432 432 enum v4l2_buf_type i); 433 - int (*vidioc_streamoff)(struct file *file, void *fh, 433 + int (*vidioc_streamoff)(struct file *file, void *priv, 434 434 enum v4l2_buf_type i); 435 435 436 436 /* ··· 438 438 * 439 439 * Note: ENUMSTD is handled by videodev.c 440 440 */ 441 - int (*vidioc_g_std)(struct file *file, void *fh, v4l2_std_id *norm); 442 - int (*vidioc_s_std)(struct file *file, void *fh, v4l2_std_id norm); 443 - int (*vidioc_querystd)(struct file *file, void *fh, v4l2_std_id *a); 441 + int (*vidioc_g_std)(struct file *file, void *priv, v4l2_std_id *norm); 442 + int (*vidioc_s_std)(struct file *file, void *priv, v4l2_std_id norm); 443 + int (*vidioc_querystd)(struct file *file, void *priv, v4l2_std_id *a); 444 444 445 445 /* Input handling */ 446 - int (*vidioc_enum_input)(struct file *file, void *fh, 446 + int (*vidioc_enum_input)(struct file *file, void *priv, 447 447 struct v4l2_input *inp); 448 - int (*vidioc_g_input)(struct file *file, void *fh, unsigned int *i); 449 - int (*vidioc_s_input)(struct file *file, void *fh, unsigned int i); 448 + int (*vidioc_g_input)(struct file *file, void *priv, unsigned int *i); 449 + int (*vidioc_s_input)(struct file *file, void *priv, unsigned int i); 450 450 451 451 /* Output handling */ 452 - int (*vidioc_enum_output)(struct file *file, void *fh, 452 + int (*vidioc_enum_output)(struct file *file, void *priv, 453 453 struct v4l2_output *a); 454 - int (*vidioc_g_output)(struct file *file, void *fh, unsigned int *i); 455 - int (*vidioc_s_output)(struct file *file, void *fh, unsigned int i); 454 + int (*vidioc_g_output)(struct file *file, void *priv, unsigned int *i); 455 + int (*vidioc_s_output)(struct file *file, void *priv, unsigned int i); 456 456 457 457 /* Control handling */ 458 - int (*vidioc_query_ext_ctrl)(struct file *file, void *fh, 458 + int (*vidioc_query_ext_ctrl)(struct file *file, void *priv, 459 459 struct v4l2_query_ext_ctrl *a); 460 - int (*vidioc_g_ext_ctrls)(struct file *file, void *fh, 460 + int (*vidioc_g_ext_ctrls)(struct file *file, void *priv, 461 461 struct v4l2_ext_controls *a); 462 - int (*vidioc_s_ext_ctrls)(struct file *file, void *fh, 462 + int (*vidioc_s_ext_ctrls)(struct file *file, void *priv, 463 463 struct v4l2_ext_controls *a); 464 - int (*vidioc_try_ext_ctrls)(struct file *file, void *fh, 464 + int (*vidioc_try_ext_ctrls)(struct file *file, void *priv, 465 465 struct v4l2_ext_controls *a); 466 - int (*vidioc_querymenu)(struct file *file, void *fh, 466 + int (*vidioc_querymenu)(struct file *file, void *priv, 467 467 struct v4l2_querymenu *a); 468 468 469 469 /* Audio ioctls */ 470 - int (*vidioc_enumaudio)(struct file *file, void *fh, 470 + int (*vidioc_enumaudio)(struct file *file, void *priv, 471 471 struct v4l2_audio *a); 472 - int (*vidioc_g_audio)(struct file *file, void *fh, 472 + int (*vidioc_g_audio)(struct file *file, void *priv, 473 473 struct v4l2_audio *a); 474 - int (*vidioc_s_audio)(struct file *file, void *fh, 474 + int (*vidioc_s_audio)(struct file *file, void *priv, 475 475 const struct v4l2_audio *a); 476 476 477 477 /* Audio out ioctls */ 478 - int (*vidioc_enumaudout)(struct file *file, void *fh, 478 + int (*vidioc_enumaudout)(struct file *file, void *priv, 479 479 struct v4l2_audioout *a); 480 - int (*vidioc_g_audout)(struct file *file, void *fh, 480 + int (*vidioc_g_audout)(struct file *file, void *priv, 481 481 struct v4l2_audioout *a); 482 - int (*vidioc_s_audout)(struct file *file, void *fh, 482 + int (*vidioc_s_audout)(struct file *file, void *priv, 483 483 const struct v4l2_audioout *a); 484 - int (*vidioc_g_modulator)(struct file *file, void *fh, 484 + int (*vidioc_g_modulator)(struct file *file, void *priv, 485 485 struct v4l2_modulator *a); 486 - int (*vidioc_s_modulator)(struct file *file, void *fh, 486 + int (*vidioc_s_modulator)(struct file *file, void *priv, 487 487 const struct v4l2_modulator *a); 488 488 /* Crop ioctls */ 489 - int (*vidioc_g_pixelaspect)(struct file *file, void *fh, 489 + int (*vidioc_g_pixelaspect)(struct file *file, void *priv, 490 490 int buf_type, struct v4l2_fract *aspect); 491 - int (*vidioc_g_selection)(struct file *file, void *fh, 491 + int (*vidioc_g_selection)(struct file *file, void *priv, 492 492 struct v4l2_selection *s); 493 - int (*vidioc_s_selection)(struct file *file, void *fh, 493 + int (*vidioc_s_selection)(struct file *file, void *priv, 494 494 struct v4l2_selection *s); 495 495 /* Compression ioctls */ 496 - int (*vidioc_g_jpegcomp)(struct file *file, void *fh, 496 + int (*vidioc_g_jpegcomp)(struct file *file, void *priv, 497 497 struct v4l2_jpegcompression *a); 498 - int (*vidioc_s_jpegcomp)(struct file *file, void *fh, 498 + int (*vidioc_s_jpegcomp)(struct file *file, void *priv, 499 499 const struct v4l2_jpegcompression *a); 500 - int (*vidioc_g_enc_index)(struct file *file, void *fh, 500 + int (*vidioc_g_enc_index)(struct file *file, void *priv, 501 501 struct v4l2_enc_idx *a); 502 - int (*vidioc_encoder_cmd)(struct file *file, void *fh, 502 + int (*vidioc_encoder_cmd)(struct file *file, void *priv, 503 503 struct v4l2_encoder_cmd *a); 504 - int (*vidioc_try_encoder_cmd)(struct file *file, void *fh, 504 + int (*vidioc_try_encoder_cmd)(struct file *file, void *priv, 505 505 struct v4l2_encoder_cmd *a); 506 - int (*vidioc_decoder_cmd)(struct file *file, void *fh, 506 + int (*vidioc_decoder_cmd)(struct file *file, void *priv, 507 507 struct v4l2_decoder_cmd *a); 508 - int (*vidioc_try_decoder_cmd)(struct file *file, void *fh, 508 + int (*vidioc_try_decoder_cmd)(struct file *file, void *priv, 509 509 struct v4l2_decoder_cmd *a); 510 510 511 511 /* Stream type-dependent parameter ioctls */ 512 - int (*vidioc_g_parm)(struct file *file, void *fh, 512 + int (*vidioc_g_parm)(struct file *file, void *priv, 513 513 struct v4l2_streamparm *a); 514 - int (*vidioc_s_parm)(struct file *file, void *fh, 514 + int (*vidioc_s_parm)(struct file *file, void *priv, 515 515 struct v4l2_streamparm *a); 516 516 517 517 /* Tuner ioctls */ 518 - int (*vidioc_g_tuner)(struct file *file, void *fh, 518 + int (*vidioc_g_tuner)(struct file *file, void *priv, 519 519 struct v4l2_tuner *a); 520 - int (*vidioc_s_tuner)(struct file *file, void *fh, 520 + int (*vidioc_s_tuner)(struct file *file, void *priv, 521 521 const struct v4l2_tuner *a); 522 - int (*vidioc_g_frequency)(struct file *file, void *fh, 522 + int (*vidioc_g_frequency)(struct file *file, void *priv, 523 523 struct v4l2_frequency *a); 524 - int (*vidioc_s_frequency)(struct file *file, void *fh, 524 + int (*vidioc_s_frequency)(struct file *file, void *priv, 525 525 const struct v4l2_frequency *a); 526 - int (*vidioc_enum_freq_bands)(struct file *file, void *fh, 526 + int (*vidioc_enum_freq_bands)(struct file *file, void *priv, 527 527 struct v4l2_frequency_band *band); 528 528 529 529 /* Sliced VBI cap */ 530 - int (*vidioc_g_sliced_vbi_cap)(struct file *file, void *fh, 530 + int (*vidioc_g_sliced_vbi_cap)(struct file *file, void *priv, 531 531 struct v4l2_sliced_vbi_cap *a); 532 532 533 533 /* Log status ioctl */ 534 - int (*vidioc_log_status)(struct file *file, void *fh); 534 + int (*vidioc_log_status)(struct file *file, void *priv); 535 535 536 - int (*vidioc_s_hw_freq_seek)(struct file *file, void *fh, 536 + int (*vidioc_s_hw_freq_seek)(struct file *file, void *priv, 537 537 const struct v4l2_hw_freq_seek *a); 538 538 539 539 /* Debugging ioctls */ 540 540 #ifdef CONFIG_VIDEO_ADV_DEBUG 541 - int (*vidioc_g_register)(struct file *file, void *fh, 541 + int (*vidioc_g_register)(struct file *file, void *priv, 542 542 struct v4l2_dbg_register *reg); 543 - int (*vidioc_s_register)(struct file *file, void *fh, 543 + int (*vidioc_s_register)(struct file *file, void *priv, 544 544 const struct v4l2_dbg_register *reg); 545 545 546 - int (*vidioc_g_chip_info)(struct file *file, void *fh, 546 + int (*vidioc_g_chip_info)(struct file *file, void *priv, 547 547 struct v4l2_dbg_chip_info *chip); 548 548 #endif 549 549 550 - int (*vidioc_enum_framesizes)(struct file *file, void *fh, 550 + int (*vidioc_enum_framesizes)(struct file *file, void *priv, 551 551 struct v4l2_frmsizeenum *fsize); 552 552 553 - int (*vidioc_enum_frameintervals)(struct file *file, void *fh, 553 + int (*vidioc_enum_frameintervals)(struct file *file, void *priv, 554 554 struct v4l2_frmivalenum *fival); 555 555 556 556 /* DV Timings IOCTLs */ 557 - int (*vidioc_s_dv_timings)(struct file *file, void *fh, 557 + int (*vidioc_s_dv_timings)(struct file *file, void *priv, 558 558 struct v4l2_dv_timings *timings); 559 - int (*vidioc_g_dv_timings)(struct file *file, void *fh, 559 + int (*vidioc_g_dv_timings)(struct file *file, void *priv, 560 560 struct v4l2_dv_timings *timings); 561 - int (*vidioc_query_dv_timings)(struct file *file, void *fh, 561 + int (*vidioc_query_dv_timings)(struct file *file, void *priv, 562 562 struct v4l2_dv_timings *timings); 563 - int (*vidioc_enum_dv_timings)(struct file *file, void *fh, 563 + int (*vidioc_enum_dv_timings)(struct file *file, void *priv, 564 564 struct v4l2_enum_dv_timings *timings); 565 - int (*vidioc_dv_timings_cap)(struct file *file, void *fh, 565 + int (*vidioc_dv_timings_cap)(struct file *file, void *priv, 566 566 struct v4l2_dv_timings_cap *cap); 567 - int (*vidioc_g_edid)(struct file *file, void *fh, 567 + int (*vidioc_g_edid)(struct file *file, void *priv, 568 568 struct v4l2_edid *edid); 569 - int (*vidioc_s_edid)(struct file *file, void *fh, 569 + int (*vidioc_s_edid)(struct file *file, void *priv, 570 570 struct v4l2_edid *edid); 571 571 572 572 int (*vidioc_subscribe_event)(struct v4l2_fh *fh, ··· 575 575 const struct v4l2_event_subscription *sub); 576 576 577 577 /* For other private ioctls */ 578 - long (*vidioc_default)(struct file *file, void *fh, 578 + long (*vidioc_default)(struct file *file, void *priv, 579 579 bool valid_prio, unsigned int cmd, void *arg); 580 580 }; 581 581