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-pci-skeleton: Rename second ioctl handlers argument to 'void *priv'

The second argument to the ioctl handlers is not a file handle any more.
Rename it to 'void *priv', to avoid misconceptions. This is particularly
important in the v4l2-pci-skeleton driver, as it is meant to be a base
for new drivers.

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
ad46aef5 0960b693

+5 -5
+5 -5
samples/v4l/v4l2-pci-skeleton.c
··· 470 470 return 0; 471 471 } 472 472 473 - static int skeleton_s_dv_timings(struct file *file, void *_fh, 473 + static int skeleton_s_dv_timings(struct file *file, void *priv, 474 474 struct v4l2_dv_timings *timings) 475 475 { 476 476 struct skeleton *skel = video_drvdata(file); ··· 509 509 return 0; 510 510 } 511 511 512 - static int skeleton_g_dv_timings(struct file *file, void *_fh, 512 + static int skeleton_g_dv_timings(struct file *file, void *priv, 513 513 struct v4l2_dv_timings *timings) 514 514 { 515 515 struct skeleton *skel = video_drvdata(file); ··· 522 522 return 0; 523 523 } 524 524 525 - static int skeleton_enum_dv_timings(struct file *file, void *_fh, 525 + static int skeleton_enum_dv_timings(struct file *file, void *priv, 526 526 struct v4l2_enum_dv_timings *timings) 527 527 { 528 528 struct skeleton *skel = video_drvdata(file); ··· 544 544 * can lock but that the DMA engine it is connected to cannot handle 545 545 * pixelclocks above a certain frequency), then -ERANGE is returned. 546 546 */ 547 - static int skeleton_query_dv_timings(struct file *file, void *_fh, 547 + static int skeleton_query_dv_timings(struct file *file, void *priv, 548 548 struct v4l2_dv_timings *timings) 549 549 { 550 550 struct skeleton *skel = video_drvdata(file); ··· 573 573 return 0; 574 574 } 575 575 576 - static int skeleton_dv_timings_cap(struct file *file, void *fh, 576 + static int skeleton_dv_timings_cap(struct file *file, void *priv, 577 577 struct v4l2_dv_timings_cap *cap) 578 578 { 579 579 struct skeleton *skel = video_drvdata(file);