media: renesas: 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>
Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Co-developed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>

diff --git a/drivers/media/platform/renesas/rcar_fdp1.c b/drivers/media/platform/renesas/rcar_fdp1.c
index e2dba0e4f3158d57996466c2222e2c697ba27e40..84c3901a2e5dc3e7ccfb3b44062e839f8f19ee02 100644 (file)
--- a/drivers/media/platform/renesas/rcar_fdp1.c
+++ b/drivers/media/platform/renesas/rcar_fdp1.c
@@ -630,14 +630,9 @@ struct fdp1_ctx {
        struct fdp1_field_buffer        *previous;
 };
 
-static inline struct fdp1_ctx *fh_to_ctx(struct v4l2_fh *fh)
-{
-       return container_of(fh, struct fdp1_ctx, fh);
-}
-
 static inline struct fdp1_ctx *file_to_ctx(struct file *filp)
 {
-       return fh_to_ctx(file_to_v4l2_fh(filp));
+       return container_of(file_to_v4l2_fh(filp), struct fdp1_ctx, fh);
 }
 
 static struct fdp1_q_data *get_q_data(struct fdp1_ctx *ctx,
@@ -1411,8 +1406,8 @@ static int fdp1_enum_fmt_vid_out(struct file *file, void *priv,
 
 static int fdp1_g_fmt(struct file *file, void *priv, struct v4l2_format *f)
 {
+       struct fdp1_ctx *ctx = file_to_ctx(file);
        struct fdp1_q_data *q_data;
-       struct fdp1_ctx *ctx = fh_to_ctx(priv);
 
        if (!v4l2_m2m_get_vq(ctx->fh.m2m_ctx, f->type))
                return -EINVAL;
@@ -1589,7 +1584,7 @@ static void fdp1_try_fmt_capture(struct fdp1_ctx *ctx,
 
 static int fdp1_try_fmt(struct file *file, void *priv, struct v4l2_format *f)
 {
-       struct fdp1_ctx *ctx = fh_to_ctx(priv);
+       struct fdp1_ctx *ctx = file_to_ctx(file);
 
        if (f->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE)
                fdp1_try_fmt_output(ctx, NULL, &f->fmt.pix_mp);
@@ -1660,7 +1655,7 @@ static void fdp1_set_format(struct fdp1_ctx *ctx,
 
 static int fdp1_s_fmt(struct file *file, void *priv, struct v4l2_format *f)
 {
-       struct fdp1_ctx *ctx = fh_to_ctx(priv);
+       struct fdp1_ctx *ctx = file_to_ctx(file);
        struct v4l2_m2m_ctx *m2m_ctx = ctx->fh.m2m_ctx;
        struct vb2_queue *vq = v4l2_m2m_get_vq(m2m_ctx, f->type);
 

diff --git a/drivers/media/platform/renesas/rcar_jpu.c b/drivers/media/platform/renesas/rcar_jpu.c
index 0b479dfa29174c6616c20e94d40fd2a8c3cec39a..9c70a74a2969fce6446b0f26e0637a68eade3942 100644 (file)
--- a/drivers/media/platform/renesas/rcar_jpu.c
+++ b/drivers/media/platform/renesas/rcar_jpu.c
@@ -480,14 +480,9 @@ static struct jpu_ctx *ctrl_to_ctx(struct v4l2_ctrl *c)
        return container_of(c->handler, struct jpu_ctx, ctrl_handler);
 }
 
-static struct jpu_ctx *fh_to_ctx(struct v4l2_fh *fh)
-{
-       return container_of(fh, struct jpu_ctx, fh);
-}
-
 static struct jpu_ctx *file_to_ctx(struct file *filp)
 {
-       return fh_to_ctx(file_to_v4l2_fh(filp));
+       return container_of(file_to_v4l2_fh(filp), struct jpu_ctx, fh);
 }
 
 static void jpu_set_tbl(struct jpu *jpu, u32 reg, const unsigned int *tbl,
@@ -661,7 +656,7 @@ static u8 jpu_parse_hdr(void *buffer, unsigned long size, unsigned int *width,
 static int jpu_querycap(struct file *file, void *priv,
                        struct v4l2_capability *cap)
 {
-       struct jpu_ctx *ctx = fh_to_ctx(priv);
+       struct jpu_ctx *ctx = file_to_ctx(file);
 
        if (ctx->encoder)
                strscpy(cap->card, DRV_NAME " encoder", sizeof(cap->card));
@@ -719,7 +714,7 @@ static int jpu_enum_fmt(struct v4l2_fmtdesc *f, u32 type)
 static int jpu_enum_fmt_cap(struct file *file, void *priv,
                            struct v4l2_fmtdesc *f)
 {
-       struct jpu_ctx *ctx = fh_to_ctx(priv);
+       struct jpu_ctx *ctx = file_to_ctx(file);
 
        return jpu_enum_fmt(f, ctx->encoder ? JPU_ENC_CAPTURE :
                            JPU_DEC_CAPTURE);
@@ -728,7 +723,7 @@ static int jpu_enum_fmt_cap(struct file *file, void *priv,
 static int jpu_enum_fmt_out(struct file *file, void *priv,
                            struct v4l2_fmtdesc *f)
 {
-       struct jpu_ctx *ctx = fh_to_ctx(priv);
+       struct jpu_ctx *ctx = file_to_ctx(file);
 
        return jpu_enum_fmt(f, ctx->encoder ? JPU_ENC_OUTPUT : JPU_DEC_OUTPUT);
 }
@@ -828,7 +823,7 @@ static int __jpu_try_fmt(struct jpu_ctx *ctx, struct jpu_fmt **fmtinfo,
 
 static int jpu_try_fmt(struct file *file, void *priv, struct v4l2_format *f)
 {
-       struct jpu_ctx *ctx = fh_to_ctx(priv);
+       struct jpu_ctx *ctx = file_to_ctx(file);
 
        if (!v4l2_m2m_get_vq(ctx->fh.m2m_ctx, f->type))
                return -EINVAL;
@@ -839,7 +834,7 @@ static int jpu_try_fmt(struct file *file, void *priv, struct v4l2_format *f)
 static int jpu_s_fmt(struct file *file, void *priv, struct v4l2_format *f)
 {
        struct vb2_queue *vq;
-       struct jpu_ctx *ctx = fh_to_ctx(priv);
+       struct jpu_ctx *ctx = file_to_ctx(file);
        struct v4l2_m2m_ctx *m2m_ctx = ctx->fh.m2m_ctx;
        struct jpu_fmt *fmtinfo;
        struct jpu_q_data *q_data;
@@ -868,8 +863,8 @@ static int jpu_s_fmt(struct file *file, void *priv, struct v4l2_format *f)
 
 static int jpu_g_fmt(struct file *file, void *priv, struct v4l2_format *f)
 {
+       struct jpu_ctx *ctx = file_to_ctx(file);
        struct jpu_q_data *q_data;
-       struct jpu_ctx *ctx = fh_to_ctx(priv);
 
        if (!v4l2_m2m_get_vq(ctx->fh.m2m_ctx, f->type))
                return -EINVAL;
@@ -902,8 +897,8 @@ static const struct v4l2_ctrl_ops jpu_ctrl_ops = {
 
 static int jpu_streamon(struct file *file, void *priv, enum v4l2_buf_type type)
 {
-       struct jpu_ctx *ctx = fh_to_ctx(priv);
        struct jpu_q_data *src_q_data, *dst_q_data, *orig, adj, *ref;
+       struct jpu_ctx *ctx = file_to_ctx(file);
        enum v4l2_buf_type adj_type;
 
        src_q_data = jpu_get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE);
@@ -1284,8 +1279,8 @@ v4l_prepare_rollback:
 
 static int jpu_release(struct file *file)
 {
-       struct jpu *jpu = video_drvdata(file);
        struct jpu_ctx *ctx = file_to_ctx(file);
+       struct jpu *jpu = video_drvdata(file);
 
        v4l2_m2m_ctx_release(ctx->fh.m2m_ctx);
        v4l2_ctrl_handler_free(&ctx->ctrl_handler);