media: wave5: 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>

diff --git a/drivers/media/platform/chips-media/wave5/wave5-helper.c b/drivers/media/platform/chips-media/wave5/wave5-helper.c
index 0bce62f0c03902ae367182ee04774c79accc4712..f03ad9c0de2215794b2456c39652785fff236966 100644 (file)
--- a/drivers/media/platform/chips-media/wave5/wave5-helper.c
+++ b/drivers/media/platform/chips-media/wave5/wave5-helper.c
@@ -142,7 +142,7 @@ int wave5_vpu_subscribe_event(struct v4l2_fh *fh, const struct v4l2_event_subscr
 
 int wave5_vpu_g_fmt_out(struct file *file, void *fh, struct v4l2_format *f)
 {
-       struct vpu_instance *inst = wave5_to_vpu_inst(fh);
+       struct vpu_instance *inst = file_to_vpu_inst(file);
        int i;
 
        f->fmt.pix_mp.width = inst->src_fmt.width;

diff --git a/drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c b/drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c
index 88eb933a51448788373775e423ae2ac5042cf8b6..72af0faa3ef2e6fb83749044eb91a58f39a3a986 100644 (file)
--- a/drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c
+++ b/drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c
@@ -506,7 +506,7 @@ static int wave5_vpu_dec_enum_fmt_cap(struct file *file, void *fh, struct v4l2_f
 
 static int wave5_vpu_dec_try_fmt_cap(struct file *file, void *fh, struct v4l2_format *f)
 {
-       struct vpu_instance *inst = wave5_to_vpu_inst(fh);
+       struct vpu_instance *inst = file_to_vpu_inst(file);
        struct dec_info *p_dec_info = &inst->codec_info->dec_info;
        const struct v4l2_frmsize_stepwise *frmsize;
        const struct vpu_format *vpu_fmt;
@@ -547,7 +547,7 @@ static int wave5_vpu_dec_try_fmt_cap(struct file *file, void *fh, struct v4l2_fo
 
 static int wave5_vpu_dec_s_fmt_cap(struct file *file, void *fh, struct v4l2_format *f)
 {
-       struct vpu_instance *inst = wave5_to_vpu_inst(fh);
+       struct vpu_instance *inst = file_to_vpu_inst(file);
        int i, ret;
 
        dev_dbg(inst->dev->dev,
@@ -606,7 +606,7 @@ static int wave5_vpu_dec_s_fmt_cap(struct file *file, void *fh, struct v4l2_form
 
 static int wave5_vpu_dec_g_fmt_cap(struct file *file, void *fh, struct v4l2_format *f)
 {
-       struct vpu_instance *inst = wave5_to_vpu_inst(fh);
+       struct vpu_instance *inst = file_to_vpu_inst(file);
        int i;
 
        f->fmt.pix_mp.width = inst->dst_fmt.width;
@@ -630,7 +630,7 @@ static int wave5_vpu_dec_g_fmt_cap(struct file *file, void *fh, struct v4l2_form
 
 static int wave5_vpu_dec_enum_fmt_out(struct file *file, void *fh, struct v4l2_fmtdesc *f)
 {
-       struct vpu_instance *inst = wave5_to_vpu_inst(fh);
+       struct vpu_instance *inst = file_to_vpu_inst(file);
        const struct vpu_format *vpu_fmt;
 
        dev_dbg(inst->dev->dev, "%s: index: %u\n", __func__, f->index);
@@ -647,7 +647,7 @@ static int wave5_vpu_dec_enum_fmt_out(struct file *file, void *fh, struct v4l2_f
 
 static int wave5_vpu_dec_try_fmt_out(struct file *file, void *fh, struct v4l2_format *f)
 {
-       struct vpu_instance *inst = wave5_to_vpu_inst(fh);
+       struct vpu_instance *inst = file_to_vpu_inst(file);
        const struct v4l2_frmsize_stepwise *frmsize;
        const struct vpu_format *vpu_fmt;
        int width, height;
@@ -678,7 +678,7 @@ static int wave5_vpu_dec_try_fmt_out(struct file *file, void *fh, struct v4l2_fo
 
 static int wave5_vpu_dec_s_fmt_out(struct file *file, void *fh, struct v4l2_format *f)
 {
-       struct vpu_instance *inst = wave5_to_vpu_inst(fh);
+       struct vpu_instance *inst = file_to_vpu_inst(file);
        const struct vpu_format *vpu_fmt;
        int i, ret;
 
@@ -727,7 +727,7 @@ static int wave5_vpu_dec_s_fmt_out(struct file *file, void *fh, struct v4l2_form
 
 static int wave5_vpu_dec_g_selection(struct file *file, void *fh, struct v4l2_selection *s)
 {
-       struct vpu_instance *inst = wave5_to_vpu_inst(fh);
+       struct vpu_instance *inst = file_to_vpu_inst(file);
 
        dev_dbg(inst->dev->dev, "%s: type: %u | target: %u\n", __func__, s->type, s->target);
 
@@ -761,7 +761,7 @@ static int wave5_vpu_dec_g_selection(struct file *file, void *fh, struct v4l2_se
 
 static int wave5_vpu_dec_s_selection(struct file *file, void *fh, struct v4l2_selection *s)
 {
-       struct vpu_instance *inst = wave5_to_vpu_inst(fh);
+       struct vpu_instance *inst = file_to_vpu_inst(file);
 
        if (s->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
                return -EINVAL;
@@ -872,7 +872,7 @@ unlock_and_return:
 
 static int wave5_vpu_dec_decoder_cmd(struct file *file, void *fh, struct v4l2_decoder_cmd *dc)
 {
-       struct vpu_instance *inst = wave5_to_vpu_inst(fh);
+       struct vpu_instance *inst = file_to_vpu_inst(file);
        struct v4l2_m2m_ctx *m2m_ctx = inst->v4l2_fh.m2m_ctx;
        int ret;
 

diff --git a/drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c b/drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c
index 322c1498758a0a569eb94cab0d6612ce18cd4c7b..279f23e1304a9e47e31c9a0bdd0efbf4c18622e1 100644 (file)
--- a/drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c
+++ b/drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c
@@ -360,7 +360,7 @@ static int wave5_vpu_enc_enum_framesizes(struct file *f, void *fh, struct v4l2_f
 
 static int wave5_vpu_enc_enum_fmt_cap(struct file *file, void *fh, struct v4l2_fmtdesc *f)
 {
-       struct vpu_instance *inst = wave5_to_vpu_inst(fh);
+       struct vpu_instance *inst = file_to_vpu_inst(file);
        const struct vpu_format *vpu_fmt;
 
        dev_dbg(inst->dev->dev, "%s: index: %u\n", __func__, f->index);
@@ -377,7 +377,7 @@ static int wave5_vpu_enc_enum_fmt_cap(struct file *file, void *fh, struct v4l2_f
 
 static int wave5_vpu_enc_try_fmt_cap(struct file *file, void *fh, struct v4l2_format *f)
 {
-       struct vpu_instance *inst = wave5_to_vpu_inst(fh);
+       struct vpu_instance *inst = file_to_vpu_inst(file);
        const struct v4l2_frmsize_stepwise *frmsize;
        const struct vpu_format *vpu_fmt;
        int width, height;
@@ -411,7 +411,7 @@ static int wave5_vpu_enc_try_fmt_cap(struct file *file, void *fh, struct v4l2_fo
 
 static int wave5_vpu_enc_s_fmt_cap(struct file *file, void *fh, struct v4l2_format *f)
 {
-       struct vpu_instance *inst = wave5_to_vpu_inst(fh);
+       struct vpu_instance *inst = file_to_vpu_inst(file);
        int i, ret;
 
        dev_dbg(inst->dev->dev, "%s: fourcc: %u width: %u height: %u num_planes: %u field: %u\n",
@@ -445,7 +445,7 @@ static int wave5_vpu_enc_s_fmt_cap(struct file *file, void *fh, struct v4l2_form
 
 static int wave5_vpu_enc_g_fmt_cap(struct file *file, void *fh, struct v4l2_format *f)
 {
-       struct vpu_instance *inst = wave5_to_vpu_inst(fh);
+       struct vpu_instance *inst = file_to_vpu_inst(file);
        int i;
 
        f->fmt.pix_mp.width = inst->dst_fmt.width;
@@ -469,7 +469,7 @@ static int wave5_vpu_enc_g_fmt_cap(struct file *file, void *fh, struct v4l2_form
 
 static int wave5_vpu_enc_enum_fmt_out(struct file *file, void *fh, struct v4l2_fmtdesc *f)
 {
-       struct vpu_instance *inst = wave5_to_vpu_inst(fh);
+       struct vpu_instance *inst = file_to_vpu_inst(file);
        const struct vpu_format *vpu_fmt;
 
        dev_dbg(inst->dev->dev, "%s: index: %u\n", __func__, f->index);
@@ -486,7 +486,7 @@ static int wave5_vpu_enc_enum_fmt_out(struct file *file, void *fh, struct v4l2_f
 
 static int wave5_vpu_enc_try_fmt_out(struct file *file, void *fh, struct v4l2_format *f)
 {
-       struct vpu_instance *inst = wave5_to_vpu_inst(fh);
+       struct vpu_instance *inst = file_to_vpu_inst(file);
        const struct v4l2_frmsize_stepwise *frmsize;
        const struct vpu_format *vpu_fmt;
        int width, height;
@@ -515,7 +515,7 @@ static int wave5_vpu_enc_try_fmt_out(struct file *file, void *fh, struct v4l2_fo
 
 static int wave5_vpu_enc_s_fmt_out(struct file *file, void *fh, struct v4l2_format *f)
 {
-       struct vpu_instance *inst = wave5_to_vpu_inst(fh);
+       struct vpu_instance *inst = file_to_vpu_inst(file);
        const struct vpu_format *vpu_fmt;
        const struct v4l2_format_info *info;
        int i, ret;
@@ -576,7 +576,7 @@ static int wave5_vpu_enc_s_fmt_out(struct file *file, void *fh, struct v4l2_form
 
 static int wave5_vpu_enc_g_selection(struct file *file, void *fh, struct v4l2_selection *s)
 {
-       struct vpu_instance *inst = wave5_to_vpu_inst(fh);
+       struct vpu_instance *inst = file_to_vpu_inst(file);
 
        dev_dbg(inst->dev->dev, "%s: type: %u | target: %u\n", __func__, s->type, s->target);
 
@@ -605,7 +605,7 @@ static int wave5_vpu_enc_g_selection(struct file *file, void *fh, struct v4l2_se
 
 static int wave5_vpu_enc_s_selection(struct file *file, void *fh, struct v4l2_selection *s)
 {
-       struct vpu_instance *inst = wave5_to_vpu_inst(fh);
+       struct vpu_instance *inst = file_to_vpu_inst(file);
 
        if (s->type != V4L2_BUF_TYPE_VIDEO_OUTPUT)
                return -EINVAL;
@@ -628,7 +628,7 @@ static int wave5_vpu_enc_s_selection(struct file *file, void *fh, struct v4l2_se
 
 static int wave5_vpu_enc_encoder_cmd(struct file *file, void *fh, struct v4l2_encoder_cmd *ec)
 {
-       struct vpu_instance *inst = wave5_to_vpu_inst(fh);
+       struct vpu_instance *inst = file_to_vpu_inst(file);
        struct v4l2_m2m_ctx *m2m_ctx = inst->v4l2_fh.m2m_ctx;
        int ret;
 
@@ -661,7 +661,7 @@ static int wave5_vpu_enc_encoder_cmd(struct file *file, void *fh, struct v4l2_en
 
 static int wave5_vpu_enc_g_parm(struct file *file, void *fh, struct v4l2_streamparm *a)
 {
-       struct vpu_instance *inst = wave5_to_vpu_inst(fh);
+       struct vpu_instance *inst = file_to_vpu_inst(file);
 
        dev_dbg(inst->dev->dev, "%s: type: %u\n", __func__, a->type);
 
@@ -681,7 +681,7 @@ static int wave5_vpu_enc_g_parm(struct file *file, void *fh, struct v4l2_streamp
 
 static int wave5_vpu_enc_s_parm(struct file *file, void *fh, struct v4l2_streamparm *a)
 {
-       struct vpu_instance *inst = wave5_to_vpu_inst(fh);
+       struct vpu_instance *inst = file_to_vpu_inst(file);
 
        dev_dbg(inst->dev->dev, "%s: type: %u\n", __func__, a->type);