media: vsp1: Don't open-code vb2_fop_release()

Use the vb2_fop_release() helper to replace the open-coded version. The
video->lock is assigned to the queue lock, used by vb2_fop_release(), so
the only functional difference is that v4l2_fh_release() is now called
before vsp1_device_put(). This should be harmless.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/media/platform/renesas/vsp1/vsp1_video.c b/drivers/media/platform/renesas/vsp1/vsp1_video.c
index 497f352e9f8c65e4a0f3d0e06be761e1e0925fdd..0180ffce35f7b3b0fc706a3a26e7cdb50c6e4ee4 100644 (file)
--- a/drivers/media/platform/renesas/vsp1/vsp1_video.c
+++ b/drivers/media/platform/renesas/vsp1/vsp1_video.c
@@ -1127,21 +1127,11 @@ static int vsp1_video_open(struct file *file)
 static int vsp1_video_release(struct file *file)
 {
        struct vsp1_video *video = video_drvdata(file);
-       struct v4l2_fh *vfh = file->private_data;
 
-       mutex_lock(&video->lock);
-       if (video->queue.owner == vfh) {
-               vb2_queue_release(&video->queue);
-               video->queue.owner = NULL;
-       }
-       mutex_unlock(&video->lock);
+       vb2_fop_release(file);
 
        vsp1_device_put(video->vsp1);
 
-       v4l2_fh_release(file);
-
-       file->private_data = NULL;
-
        return 0;
 }