[PATCH 0/2] media: platform: rcar_jpu: code cleanup and release function changes

[PATCH 0/2] media: platform: rcar_jpu: code cleanup and release function changes

[Mikhail Ulyanov]

This series of patches includes improvements and code cleanup for rcar_jpu driver.

Mikhail Ulyanov (2):
  V4L2: platform: rcar_jpu: remove redundant code
  V4L2: platform: rcar_jpu: switch off clock on release later

 drivers/media/platform/rcar_jpu.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

-- 
2.5.1

[PATCH 1/2] V4L2: platform: rcar_jpu: remove redundant code

[Mikhail Ulyanov]

Remove redundant code. Following code line do what we want.

Signed-off-by: Mikhail Ulyanov <mikhail.ulyanov@cogentembedded.com>
---
 drivers/media/platform/rcar_jpu.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/drivers/media/platform/rcar_jpu.c b/drivers/media/platform/rcar_jpu.c
index 2973f07..039bbbc 100644
--- a/drivers/media/platform/rcar_jpu.c
+++ b/drivers/media/platform/rcar_jpu.c
@@ -1555,9 +1555,6 @@ static irqreturn_t jpu_irq_handler(int irq, void *dev_id)
 		dst_buf->v4l2_buf.timestamp = src_buf->v4l2_buf.timestamp;
 		if (src_buf->v4l2_buf.flags & V4L2_BUF_FLAG_TIMECODE)
 			dst_buf->v4l2_buf.timecode = src_buf->v4l2_buf.timecode;
-		dst_buf->v4l2_buf.flags &= ~V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
-		dst_buf->v4l2_buf.flags |= src_buf->v4l2_buf.flags &
-					V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
 		dst_buf->v4l2_buf.flags = src_buf->v4l2_buf.flags &
 			(V4L2_BUF_FLAG_TIMECODE | V4L2_BUF_FLAG_KEYFRAME |
 			 V4L2_BUF_FLAG_PFRAME | V4L2_BUF_FLAG_BFRAME |
-- 
2.5.1

[PATCH 2/2] V4L2: platform: rcar_jpu: switch off clock on release later

[Mikhail Ulyanov]

Give JPU peripheral chance to finish current job.
Don't switch off clock until context release.

Signed-off-by: Mikhail Ulyanov <mikhail.ulyanov@cogentembedded.com>
---
 drivers/media/platform/rcar_jpu.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/media/platform/rcar_jpu.c b/drivers/media/platform/rcar_jpu.c
index 039bbbc..aa327e6 100644
--- a/drivers/media/platform/rcar_jpu.c
+++ b/drivers/media/platform/rcar_jpu.c
@@ -1296,17 +1296,17 @@ static int jpu_release(struct file *file)
 	struct jpu *jpu = video_drvdata(file);
 	struct jpu_ctx *ctx = fh_to_ctx(file->private_data);
 
-	mutex_lock(&jpu->mutex);
-	if (--jpu->ref_count == 0)
-		clk_disable_unprepare(jpu->clk);
-	mutex_unlock(&jpu->mutex);
-
 	v4l2_m2m_ctx_release(ctx->fh.m2m_ctx);
 	v4l2_ctrl_handler_free(&ctx->ctrl_handler);
 	v4l2_fh_del(&ctx->fh);
 	v4l2_fh_exit(&ctx->fh);
 	kfree(ctx);
 
+	mutex_lock(&jpu->mutex);
+	if (--jpu->ref_count == 0)
+		clk_disable_unprepare(jpu->clk);
+	mutex_unlock(&jpu->mutex);
+
 	return 0;
 }
 
-- 
2.5.1