[COMMON] media: mfc: DRV4.0: encapsulate mfc_ctx_ready()

The mfc_ctx_ready() calls mfc_dec_ctx_ready() or mfc_enc_ctx_ready()
according to ctx->type. This changes mfc_dec/enc_ctx_ready() to static
and caller uses only mfc_ctx_ready().

Change-Id: Ica665363a32316a72e9f385f2f884ac68a5ab5e9
Signed-off-by: Sunyoung Kang <sy0816.kang@samsung.com>

diff --git a/drivers/media/platform/exynos/mfc/mfc_dec_v4l2.c b/drivers/media/platform/exynos/mfc/mfc_dec_v4l2.c
index 06053d72dd3313594d2dd8554e54c262058751bb..fceeb14fb0d83afd5467bdfe17bb0e689682f1e0 100644 (file)
--- a/drivers/media/platform/exynos/mfc/mfc_dec_v4l2.c
+++ b/drivers/media/platform/exynos/mfc/mfc_dec_v4l2.c
@@ -557,7 +557,7 @@ static int vidioc_s_fmt_vid_out_mplane(struct file *file, void *priv,
 
        mfc_debug(2, "Got instance number: %d\n", ctx->inst_no);
 
-       if (mfc_dec_ctx_ready(ctx))
+       if (mfc_ctx_ready(ctx))
                mfc_set_bit(ctx->num, &dev->work_bits);
        if (mfc_is_work_to_do(dev))
                queue_work(dev->butler_wq, &dev->butler_work);
@@ -664,7 +664,7 @@ static int vidioc_reqbufs(struct file *file, void *priv,
 
                ctx->capture_state = QUEUE_BUFS_REQUESTED;
 
-               if (mfc_dec_ctx_ready(ctx))
+               if (mfc_ctx_ready(ctx))
                        mfc_set_bit(ctx->num, &dev->work_bits);
 
                mfc_try_run(dev);

diff --git a/drivers/media/platform/exynos/mfc/mfc_dec_vb2.c b/drivers/media/platform/exynos/mfc/mfc_dec_vb2.c
index 4478ceb2f4f4f28f6d3cb2341da67e9758439626..2730527a06092319a9aaa423c13136c8c4ec2167 100644 (file)
--- a/drivers/media/platform/exynos/mfc/mfc_dec_vb2.c
+++ b/drivers/media/platform/exynos/mfc/mfc_dec_vb2.c
@@ -351,9 +351,8 @@ static int mfc_dec_start_streaming(struct vb2_queue *q, unsigned int count)
                mfc_change_state(ctx, MFCINST_RUNNING);
 
        /* If context is ready then dev = work->data;schedule it to run */
-       if (mfc_dec_ctx_ready(ctx)) {
+       if (mfc_ctx_ready(ctx))
                mfc_set_bit(ctx->num, &dev->work_bits);
-       }
 
        mfc_try_run(dev);
 
@@ -546,7 +545,7 @@ static void mfc_dec_stop_streaming(struct vb2_queue *q)
        mfc_clear_bit(ctx->num, &dev->work_bits);
        mfc_release_hwlock_ctx(ctx);
 
-       if (mfc_dec_ctx_ready(ctx))
+       if (mfc_ctx_ready(ctx))
                mfc_set_bit(ctx->num, &dev->work_bits);
        if (mfc_is_work_to_do(dev))
                queue_work(dev->butler_wq, &dev->butler_work);
@@ -615,7 +614,7 @@ static void mfc_dec_buf_queue(struct vb2_buffer *vb)
                mfc_err_ctx("Unsupported buffer type (%d)\n", vq->type);
        }
 
-       if (mfc_dec_ctx_ready(ctx)) {
+       if (mfc_ctx_ready(ctx)) {
                mfc_set_bit(ctx->num, &dev->work_bits);
                mfc_try_run(dev);
        }

diff --git a/drivers/media/platform/exynos/mfc/mfc_enc_v4l2.c b/drivers/media/platform/exynos/mfc/mfc_enc_v4l2.c
index 09eb5b74cfe0980d8c61e2fb8bb0ce6e5e13599f..8fcf61dbf557c465aa37514c3cd24f5251974b08 100644 (file)
--- a/drivers/media/platform/exynos/mfc/mfc_enc_v4l2.c
+++ b/drivers/media/platform/exynos/mfc/mfc_enc_v4l2.c
@@ -477,7 +477,7 @@ static int vidioc_s_fmt_vid_cap_mplane(struct file *file, void *priv,
 
        mfc_debug(2, "Got instance number: %d\n", ctx->inst_no);
 
-       if (mfc_enc_ctx_ready(ctx))
+       if (mfc_ctx_ready(ctx))
                mfc_set_bit(ctx->num, &dev->work_bits);
        if (ctx->otf_handle && mfc_otf_ctx_ready(ctx))
                mfc_set_bit(ctx->num, &dev->work_bits);

diff --git a/drivers/media/platform/exynos/mfc/mfc_enc_vb2.c b/drivers/media/platform/exynos/mfc/mfc_enc_vb2.c
index b33c1e0412875bb927488e6e7a21497e6025defc..f80fcc27d36d8faa1ebff15f97771543e3224b6f 100644 (file)
--- a/drivers/media/platform/exynos/mfc/mfc_enc_vb2.c
+++ b/drivers/media/platform/exynos/mfc/mfc_enc_vb2.c
@@ -328,9 +328,8 @@ static int mfc_enc_start_streaming(struct vb2_queue *q, unsigned int count)
        struct mfc_dev *dev = ctx->dev;
 
        /* If context is ready then dev = work->data;schedule it to run */
-       if (mfc_enc_ctx_ready(ctx)) {
+       if (mfc_ctx_ready(ctx))
                mfc_set_bit(ctx->num, &dev->work_bits);
-       }
 
        mfc_try_run(dev);
 
@@ -456,9 +455,9 @@ static void mfc_enc_buf_queue(struct vb2_buffer *vb)
                mfc_err_ctx("unsupported buffer type (%d)\n", vq->type);
        }
 
-       if (mfc_enc_ctx_ready(ctx)) {
+       if (mfc_ctx_ready(ctx))
                mfc_set_bit(ctx->num, &dev->work_bits);
-       }
+
        mfc_try_run(dev);
 
        mfc_debug_leave();

diff --git a/drivers/media/platform/exynos/mfc/mfc_sync.c b/drivers/media/platform/exynos/mfc/mfc_sync.c
index c2a4c6a93e089b0dd88b0a8a7860eb1d19bfef98..bbe0513d56aed41e9424b62ab650035bd2b94303 100644 (file)
--- a/drivers/media/platform/exynos/mfc/mfc_sync.c
+++ b/drivers/media/platform/exynos/mfc/mfc_sync.c
@@ -206,7 +206,7 @@ int mfc_get_new_ctx(struct mfc_dev *dev)
 }
 
 /* Check whether a context should be run on hardware */
-int mfc_dec_ctx_ready(struct mfc_ctx *ctx)
+static int __mfc_dec_ctx_ready(struct mfc_ctx *ctx)
 {
        struct mfc_dev *dev = ctx->dev;
        int src_buf_queue_greater_than_0 = 0;
@@ -269,7 +269,7 @@ int mfc_dec_ctx_ready(struct mfc_ctx *ctx)
        return 0;
 }
 
-int mfc_enc_ctx_ready(struct mfc_ctx *ctx)
+static int __mfc_enc_ctx_ready(struct mfc_ctx *ctx)
 {
        struct mfc_enc *enc = ctx->enc_priv;
        struct mfc_dev *dev = ctx->dev;
@@ -334,9 +334,9 @@ int mfc_enc_ctx_ready(struct mfc_ctx *ctx)
 int mfc_ctx_ready(struct mfc_ctx *ctx)
 {
        if (ctx->type == MFCINST_DECODER)
-               return mfc_dec_ctx_ready(ctx);
+               return __mfc_dec_ctx_ready(ctx);
        else if (ctx->type == MFCINST_ENCODER)
-               return mfc_enc_ctx_ready(ctx);
+               return __mfc_enc_ctx_ready(ctx);
 
        return 0;
 }

diff --git a/drivers/media/platform/exynos/mfc/mfc_sync.h b/drivers/media/platform/exynos/mfc/mfc_sync.h
index 21f333dd4c0e37f6e4fb86fa21d87aae1ba87ef3..d18cc2eccac2cf4a1214c1d9a45f8915c99f4e5f 100644 (file)
--- a/drivers/media/platform/exynos/mfc/mfc_sync.h
+++ b/drivers/media/platform/exynos/mfc/mfc_sync.h
@@ -44,11 +44,8 @@ void mfc_wake_up_ctx(struct mfc_ctx *ctx, unsigned int reason,
                unsigned int err);
 
 int mfc_get_new_ctx(struct mfc_dev *dev);
-int mfc_dec_ctx_ready(struct mfc_ctx *ctx);
-int mfc_enc_ctx_ready(struct mfc_ctx *ctx);
 int mfc_ctx_ready(struct mfc_ctx *ctx);
 
-
 static inline void mfc_set_bit(int num, struct mfc_bits *data)
 {
        unsigned long flags;