summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>2025-08-10 04:30:05 +0300
committerHans Verkuil <hverkuil+cisco@kernel.org>2025-08-13 09:33:33 +0300
commit61a08386dcf48c708f42da9917a28f5ffe0701f6 (patch)
treec152be46e3d9e0ee0d087731d1db40c8e8a8fb32
parentc284b5ab97a6ad8bdac9375dff0115ea49088c38 (diff)
downloadlinux-61a08386dcf48c708f42da9917a28f5ffe0701f6.tar.xz
media: qcom: iris: Set file->private_data in iris_v4l2_fh_(de)init()
In preparation for a tree-wide rework automated with coccinelle that will affect file->private_data, v4l2_fh_add() and v4l2_fh_del(), move setting file->private_data from the callers to the iris_v4l2_fh_init() and iris_v4l2_fh_deinit() functions. There is not functional change yet. Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>
-rw-r--r--drivers/media/platform/qcom/iris/iris_vidc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/platform/qcom/iris/iris_vidc.c b/drivers/media/platform/qcom/iris/iris_vidc.c
index d5f99519def4..73c96498759c 100644
--- a/drivers/media/platform/qcom/iris/iris_vidc.c
+++ b/drivers/media/platform/qcom/iris/iris_vidc.c
@@ -26,10 +26,12 @@ static void iris_v4l2_fh_init(struct iris_inst *inst, struct file *filp)
v4l2_fh_init(&inst->fh, inst->core->vdev_dec);
inst->fh.ctrl_handler = &inst->ctrl_handler;
v4l2_fh_add(&inst->fh);
+ filp->private_data = &inst->fh;
}
static void iris_v4l2_fh_deinit(struct iris_inst *inst, struct file *filp)
{
+ filp->private_data = NULL;
v4l2_fh_del(&inst->fh);
inst->fh.ctrl_handler = NULL;
v4l2_fh_exit(&inst->fh);
@@ -185,7 +187,6 @@ int iris_open(struct file *filp)
iris_add_session(inst);
inst->fh.m2m_ctx = inst->m2m_ctx;
- filp->private_data = &inst->fh;
return 0;
@@ -269,7 +270,6 @@ int iris_close(struct file *filp)
mutex_destroy(&inst->ctx_q_lock);
mutex_destroy(&inst->lock);
kfree(inst);
- filp->private_data = NULL;
return 0;
}