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

media: staging: Rename second ioctl handlers argument to 'void *priv'

The second argument to the ioctl handlers is not a file handle any more.
The standard practice is to name it 'void *priv' in drivers. Many
drivers still name it 'void *fh', and a few use more exotic names.
Replace those more exotic names with 'void *priv' in all media staging
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 078f1a7e 5396f5ae

+11 -11
+8 -8
drivers/staging/media/sunxi/sun6i-isp/sun6i_isp_capture.c
··· 419 419 pix_format->xfer_func = V4L2_XFER_FUNC_DEFAULT; 420 420 } 421 421 422 - static int sun6i_isp_capture_querycap(struct file *file, void *private, 422 + static int sun6i_isp_capture_querycap(struct file *file, void *priv, 423 423 struct v4l2_capability *capability) 424 424 { 425 425 struct sun6i_isp_device *isp_dev = video_drvdata(file); ··· 433 433 return 0; 434 434 } 435 435 436 - static int sun6i_isp_capture_enum_fmt(struct file *file, void *private, 436 + static int sun6i_isp_capture_enum_fmt(struct file *file, void *priv, 437 437 struct v4l2_fmtdesc *fmtdesc) 438 438 { 439 439 u32 index = fmtdesc->index; ··· 446 446 return 0; 447 447 } 448 448 449 - static int sun6i_isp_capture_g_fmt(struct file *file, void *private, 449 + static int sun6i_isp_capture_g_fmt(struct file *file, void *priv, 450 450 struct v4l2_format *format) 451 451 { 452 452 struct sun6i_isp_device *isp_dev = video_drvdata(file); ··· 456 456 return 0; 457 457 } 458 458 459 - static int sun6i_isp_capture_s_fmt(struct file *file, void *private, 459 + static int sun6i_isp_capture_s_fmt(struct file *file, void *priv, 460 460 struct v4l2_format *format) 461 461 { 462 462 struct sun6i_isp_device *isp_dev = video_drvdata(file); ··· 471 471 return 0; 472 472 } 473 473 474 - static int sun6i_isp_capture_try_fmt(struct file *file, void *private, 474 + static int sun6i_isp_capture_try_fmt(struct file *file, void *priv, 475 475 struct v4l2_format *format) 476 476 { 477 477 sun6i_isp_capture_format_prepare(format); ··· 479 479 return 0; 480 480 } 481 481 482 - static int sun6i_isp_capture_enum_input(struct file *file, void *private, 482 + static int sun6i_isp_capture_enum_input(struct file *file, void *priv, 483 483 struct v4l2_input *input) 484 484 { 485 485 if (input->index != 0) ··· 491 491 return 0; 492 492 } 493 493 494 - static int sun6i_isp_capture_g_input(struct file *file, void *private, 494 + static int sun6i_isp_capture_g_input(struct file *file, void *priv, 495 495 unsigned int *index) 496 496 { 497 497 *index = 0; ··· 499 499 return 0; 500 500 } 501 501 502 - static int sun6i_isp_capture_s_input(struct file *file, void *private, 502 + static int sun6i_isp_capture_s_input(struct file *file, void *priv, 503 503 unsigned int index) 504 504 { 505 505 if (index != 0)
+3 -3
drivers/staging/media/sunxi/sun6i-isp/sun6i_isp_params.c
··· 383 383 384 384 /* Video Device */ 385 385 386 - static int sun6i_isp_params_querycap(struct file *file, void *private, 386 + static int sun6i_isp_params_querycap(struct file *file, void *priv, 387 387 struct v4l2_capability *capability) 388 388 { 389 389 struct sun6i_isp_device *isp_dev = video_drvdata(file); ··· 397 397 return 0; 398 398 } 399 399 400 - static int sun6i_isp_params_enum_fmt(struct file *file, void *private, 400 + static int sun6i_isp_params_enum_fmt(struct file *file, void *priv, 401 401 struct v4l2_fmtdesc *fmtdesc) 402 402 { 403 403 struct sun6i_isp_device *isp_dev = video_drvdata(file); ··· 412 412 return 0; 413 413 } 414 414 415 - static int sun6i_isp_params_g_fmt(struct file *file, void *private, 415 + static int sun6i_isp_params_g_fmt(struct file *file, void *priv, 416 416 struct v4l2_format *format) 417 417 { 418 418 struct sun6i_isp_device *isp_dev = video_drvdata(file);