mirror of
https://github.com/torvalds/linux.git
synced 2026-07-30 11:11:26 +02:00
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>
This commit is contained in:
parent
5396f5ae0e
commit
078f1a7eb4
|
|
@ -419,7 +419,7 @@ static void sun6i_isp_capture_format_prepare(struct v4l2_format *format)
|
|||
pix_format->xfer_func = V4L2_XFER_FUNC_DEFAULT;
|
||||
}
|
||||
|
||||
static int sun6i_isp_capture_querycap(struct file *file, void *private,
|
||||
static int sun6i_isp_capture_querycap(struct file *file, void *priv,
|
||||
struct v4l2_capability *capability)
|
||||
{
|
||||
struct sun6i_isp_device *isp_dev = video_drvdata(file);
|
||||
|
|
@ -433,7 +433,7 @@ static int sun6i_isp_capture_querycap(struct file *file, void *private,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int sun6i_isp_capture_enum_fmt(struct file *file, void *private,
|
||||
static int sun6i_isp_capture_enum_fmt(struct file *file, void *priv,
|
||||
struct v4l2_fmtdesc *fmtdesc)
|
||||
{
|
||||
u32 index = fmtdesc->index;
|
||||
|
|
@ -446,7 +446,7 @@ static int sun6i_isp_capture_enum_fmt(struct file *file, void *private,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int sun6i_isp_capture_g_fmt(struct file *file, void *private,
|
||||
static int sun6i_isp_capture_g_fmt(struct file *file, void *priv,
|
||||
struct v4l2_format *format)
|
||||
{
|
||||
struct sun6i_isp_device *isp_dev = video_drvdata(file);
|
||||
|
|
@ -456,7 +456,7 @@ static int sun6i_isp_capture_g_fmt(struct file *file, void *private,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int sun6i_isp_capture_s_fmt(struct file *file, void *private,
|
||||
static int sun6i_isp_capture_s_fmt(struct file *file, void *priv,
|
||||
struct v4l2_format *format)
|
||||
{
|
||||
struct sun6i_isp_device *isp_dev = video_drvdata(file);
|
||||
|
|
@ -471,7 +471,7 @@ static int sun6i_isp_capture_s_fmt(struct file *file, void *private,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int sun6i_isp_capture_try_fmt(struct file *file, void *private,
|
||||
static int sun6i_isp_capture_try_fmt(struct file *file, void *priv,
|
||||
struct v4l2_format *format)
|
||||
{
|
||||
sun6i_isp_capture_format_prepare(format);
|
||||
|
|
@ -479,7 +479,7 @@ static int sun6i_isp_capture_try_fmt(struct file *file, void *private,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int sun6i_isp_capture_enum_input(struct file *file, void *private,
|
||||
static int sun6i_isp_capture_enum_input(struct file *file, void *priv,
|
||||
struct v4l2_input *input)
|
||||
{
|
||||
if (input->index != 0)
|
||||
|
|
@ -491,7 +491,7 @@ static int sun6i_isp_capture_enum_input(struct file *file, void *private,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int sun6i_isp_capture_g_input(struct file *file, void *private,
|
||||
static int sun6i_isp_capture_g_input(struct file *file, void *priv,
|
||||
unsigned int *index)
|
||||
{
|
||||
*index = 0;
|
||||
|
|
@ -499,7 +499,7 @@ static int sun6i_isp_capture_g_input(struct file *file, void *private,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int sun6i_isp_capture_s_input(struct file *file, void *private,
|
||||
static int sun6i_isp_capture_s_input(struct file *file, void *priv,
|
||||
unsigned int index)
|
||||
{
|
||||
if (index != 0)
|
||||
|
|
|
|||
|
|
@ -383,7 +383,7 @@ static const struct vb2_ops sun6i_isp_params_queue_ops = {
|
|||
|
||||
/* Video Device */
|
||||
|
||||
static int sun6i_isp_params_querycap(struct file *file, void *private,
|
||||
static int sun6i_isp_params_querycap(struct file *file, void *priv,
|
||||
struct v4l2_capability *capability)
|
||||
{
|
||||
struct sun6i_isp_device *isp_dev = video_drvdata(file);
|
||||
|
|
@ -397,7 +397,7 @@ static int sun6i_isp_params_querycap(struct file *file, void *private,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int sun6i_isp_params_enum_fmt(struct file *file, void *private,
|
||||
static int sun6i_isp_params_enum_fmt(struct file *file, void *priv,
|
||||
struct v4l2_fmtdesc *fmtdesc)
|
||||
{
|
||||
struct sun6i_isp_device *isp_dev = video_drvdata(file);
|
||||
|
|
@ -412,7 +412,7 @@ static int sun6i_isp_params_enum_fmt(struct file *file, void *private,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int sun6i_isp_params_g_fmt(struct file *file, void *private,
|
||||
static int sun6i_isp_params_g_fmt(struct file *file, void *priv,
|
||||
struct v4l2_format *format)
|
||||
{
|
||||
struct sun6i_isp_device *isp_dev = video_drvdata(file);
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user