mirror of
https://github.com/torvalds/linux.git
synced 2026-07-31 03:27:03 +02:00
media: nxp: mx2: Access v4l2_fh from file
The v4l2_fh associated with an open file handle is now guaranteed to be available in file->private_data, initialised by v4l2_fh_add(). Access the v4l2_fh, and from there the driver-specific structure, from the file * in all ioctl handlers. Signed-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com> Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>
This commit is contained in:
parent
f048bf7d75
commit
cdc5699675
|
|
@ -456,13 +456,13 @@ static int vidioc_g_fmt(struct emmaprp_ctx *ctx, struct v4l2_format *f)
|
|||
static int vidioc_g_fmt_vid_out(struct file *file, void *priv,
|
||||
struct v4l2_format *f)
|
||||
{
|
||||
return vidioc_g_fmt(priv, f);
|
||||
return vidioc_g_fmt(file_to_emmaprp_ctx(file), f);
|
||||
}
|
||||
|
||||
static int vidioc_g_fmt_vid_cap(struct file *file, void *priv,
|
||||
struct v4l2_format *f)
|
||||
{
|
||||
return vidioc_g_fmt(priv, f);
|
||||
return vidioc_g_fmt(file_to_emmaprp_ctx(file), f);
|
||||
}
|
||||
|
||||
static int vidioc_try_fmt(struct v4l2_format *f)
|
||||
|
|
@ -502,8 +502,8 @@ static int vidioc_try_fmt(struct v4l2_format *f)
|
|||
static int vidioc_try_fmt_vid_cap(struct file *file, void *priv,
|
||||
struct v4l2_format *f)
|
||||
{
|
||||
struct emmaprp_ctx *ctx = file_to_emmaprp_ctx(file);
|
||||
struct emmaprp_fmt *fmt;
|
||||
struct emmaprp_ctx *ctx = priv;
|
||||
|
||||
fmt = find_format(f);
|
||||
if (!fmt || !(fmt->types & MEM2MEM_CAPTURE)) {
|
||||
|
|
@ -519,8 +519,8 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv,
|
|||
static int vidioc_try_fmt_vid_out(struct file *file, void *priv,
|
||||
struct v4l2_format *f)
|
||||
{
|
||||
struct emmaprp_ctx *ctx = file_to_emmaprp_ctx(file);
|
||||
struct emmaprp_fmt *fmt;
|
||||
struct emmaprp_ctx *ctx = priv;
|
||||
|
||||
fmt = find_format(f);
|
||||
if (!fmt || !(fmt->types & MEM2MEM_OUTPUT)) {
|
||||
|
|
@ -580,7 +580,7 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
|
|||
if (ret)
|
||||
return ret;
|
||||
|
||||
return vidioc_s_fmt(priv, f);
|
||||
return vidioc_s_fmt(file_to_emmaprp_ctx(file), f);
|
||||
}
|
||||
|
||||
static int vidioc_s_fmt_vid_out(struct file *file, void *priv,
|
||||
|
|
@ -592,7 +592,7 @@ static int vidioc_s_fmt_vid_out(struct file *file, void *priv,
|
|||
if (ret)
|
||||
return ret;
|
||||
|
||||
return vidioc_s_fmt(priv, f);
|
||||
return vidioc_s_fmt(file_to_emmaprp_ctx(file), f);
|
||||
}
|
||||
|
||||
static const struct v4l2_ioctl_ops emmaprp_ioctl_ops = {
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user