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>

diff --git a/drivers/media/platform/qcom/iris/iris_vidc.c b/drivers/media/platform/qcom/iris/iris_vidc.c
index d5f99519def45d1c5859e641eed490ec9ad5784a..73c96498759cbde8e1d9870336023e7773f6f28b 100644 (file)
--- 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;
 }