[COMMON] media: mfc: DRV4.0: remove unnecessary code in mfc_buf

This removes the NULL check for data already identified like
mfc_dev, mfc_ctx.

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

diff --git a/drivers/media/platform/exynos/mfc/mfc.c b/drivers/media/platform/exynos/mfc/mfc.c
index e2cc0913dbef4b6b692aeb22580bc129a62479e6..7b450ffc9897c454a2ba7c98395154e17dd9f31c 100644 (file)
--- a/drivers/media/platform/exynos/mfc/mfc.c
+++ b/drivers/media/platform/exynos/mfc/mfc.c
@@ -352,9 +352,7 @@ static int __mfc_init_instance(struct mfc_dev *dev, struct mfc_ctx *ctx)
 #endif
        trace_mfc_dcpp_end(ctx->num, 1, dev->fw.drm_status);
 
-       ret = mfc_alloc_common_context(dev);
-       if (ret)
-               goto err_context_alloc;
+       mfc_alloc_common_context(dev);
 
        if (dbg_enable)
                mfc_alloc_dbg_info_buffer(dev);
@@ -409,7 +407,6 @@ err_pwr_enable:
 err_hw_lock:
        mfc_release_common_context(dev);
 
-err_context_alloc:
 #ifdef CONFIG_EXYNOS_CONTENT_PATH_PROTECTION
        if (dev->fw.drm_status) {
                int smc_ret = 0;

diff --git a/drivers/media/platform/exynos/mfc/mfc_buf.c b/drivers/media/platform/exynos/mfc/mfc_buf.c
index 8ef61c60f56ec7284462e6b135665fedadc54c9f..6d5f9340e156220d9bfe1808a9ae9fb226867291 100644 (file)
--- a/drivers/media/platform/exynos/mfc/mfc_buf.c
+++ b/drivers/media/platform/exynos/mfc/mfc_buf.c
@@ -18,7 +18,7 @@
 
 #include "mfc_mem.h"
 
-static int __mfc_alloc_common_context(struct mfc_dev *dev,
+static void __mfc_alloc_common_context(struct mfc_dev *dev,
                                        enum mfc_buf_usage_type buf_type)
 {
        struct mfc_special_buf *ctx_buf;
@@ -26,10 +26,6 @@ static int __mfc_alloc_common_context(struct mfc_dev *dev,
        unsigned long fw_daddr;
 
        mfc_debug_enter();
-       if (!dev) {
-               mfc_err_dev("no mfc device to run\n");
-               return -EINVAL;
-       }
 
        ctx_buf = &dev->common_ctx_buf;
        fw_daddr = dev->fw_buf.daddr;
@@ -48,27 +44,17 @@ static int __mfc_alloc_common_context(struct mfc_dev *dev,
        ctx_buf->daddr = fw_daddr + firmware_size;
 
        mfc_debug_leave();
-
-       return 0;
 }
 
 /* Wrapper : allocate context buffers for SYS_INIT */
-int mfc_alloc_common_context(struct mfc_dev *dev)
+void mfc_alloc_common_context(struct mfc_dev *dev)
 {
-       int ret = 0;
+       __mfc_alloc_common_context(dev, MFCBUF_NORMAL);
 
-       ret = __mfc_alloc_common_context(dev, MFCBUF_NORMAL);
-       if (ret)
-               return ret;
 #ifdef CONFIG_EXYNOS_CONTENT_PATH_PROTECTION
-       if (dev->fw.drm_status) {
-               ret = __mfc_alloc_common_context(dev, MFCBUF_DRM);
-               if (ret)
-                       return ret;
-       }
+       if (dev->fw.drm_status)
+               __mfc_alloc_common_context(dev, MFCBUF_DRM);
 #endif
-
-       return ret;
 }
 
 /* Release context buffers for SYS_INIT */
@@ -77,11 +63,6 @@ static void __mfc_release_common_context(struct mfc_dev *dev,
 {
        struct mfc_special_buf *ctx_buf;
 
-       if (!dev) {
-               mfc_err_dev("no mfc device to run\n");
-               return;
-       }
-
        ctx_buf = &dev->common_ctx_buf;
 #ifdef CONFIG_EXYNOS_CONTENT_PATH_PROTECTION
        if (buf_type == MFCBUF_DRM)
@@ -106,19 +87,11 @@ void mfc_release_common_context(struct mfc_dev *dev)
 /* Allocate memory for instance data buffer */
 int mfc_alloc_instance_context(struct mfc_ctx *ctx)
 {
-       struct mfc_dev *dev;
+       struct mfc_dev *dev = ctx->dev;
        struct mfc_ctx_buf_size *buf_size;
 
        mfc_debug_enter();
-       if (!ctx) {
-               mfc_err_dev("no mfc context to run\n");
-               return -EINVAL;
-       }
-       dev = ctx->dev;
-       if (!dev) {
-               mfc_err_dev("no mfc device to run\n");
-               return -EINVAL;
-       }
+
        buf_size = dev->variant->buf_size->ctx_buf;
 
        switch (ctx->codec_mode) {
@@ -179,19 +152,9 @@ int mfc_alloc_instance_context(struct mfc_ctx *ctx)
 /* Release instance buffer */
 void mfc_release_instance_context(struct mfc_ctx *ctx)
 {
-       struct mfc_dev *dev;
+       struct mfc_dev *dev = ctx->dev;
 
        mfc_debug_enter();
-       if (!ctx) {
-               mfc_err_dev("no mfc context to run\n");
-               return;
-       }
-
-       dev = ctx->dev;
-       if (!dev) {
-               mfc_err_dev("no mfc device to run\n");
-               return;
-       }
 
        mfc_mem_ion_free(dev, &ctx->instance_ctx_buf);
        mfc_debug(2, "[MEMINFO] Release the instance buffer ctx[%d]\n", ctx->num);
@@ -382,18 +345,9 @@ static void __mfc_enc_calc_codec_buffer_size(struct mfc_ctx *ctx)
 /* Allocate codec buffers */
 int mfc_alloc_codec_buffers(struct mfc_ctx *ctx)
 {
-       struct mfc_dev *dev;
+       struct mfc_dev *dev = ctx->dev;
 
        mfc_debug_enter();
-       if (!ctx) {
-               mfc_err_dev("no mfc context to run\n");
-               return -EINVAL;
-       }
-       dev = ctx->dev;
-       if (!dev) {
-               mfc_err_dev("no mfc device to run\n");
-               return -EINVAL;
-       }
 
        if (ctx->type == MFCINST_DECODER) {
                __mfc_dec_calc_codec_buffer_size(ctx);
@@ -428,18 +382,7 @@ int mfc_alloc_codec_buffers(struct mfc_ctx *ctx)
 /* Release buffers allocated for codec */
 void mfc_release_codec_buffers(struct mfc_ctx *ctx)
 {
-       struct mfc_dev *dev;
-
-       if (!ctx) {
-               mfc_err_dev("no mfc context to run\n");
-               return;
-       }
-
-       dev = ctx->dev;
-       if (!dev) {
-               mfc_err_dev("no mfc device to run\n");
-               return;
-       }
+       struct mfc_dev *dev = ctx->dev;
 
        mfc_mem_ion_free(dev, &ctx->codec_buf);
        ctx->codec_buffer_allocated = 0;
@@ -466,22 +409,13 @@ int mfc_alloc_dbg_info_buffer(struct mfc_dev *dev)
 }
 
 /* Release buffer of debug infor memory for FW debugging */
-int mfc_release_dbg_info_buffer(struct mfc_dev *dev)
+void mfc_release_dbg_info_buffer(struct mfc_dev *dev)
 {
-       if (!dev) {
-               mfc_err_dev("no mfc device to run\n");
-               return -EINVAL;
-       }
-
-       if (!dev->dbg_info_buf.dma_buf) {
+       if (!dev->dbg_info_buf.dma_buf)
                mfc_debug(2, "debug info buffer is already freed\n");
-               return 0;
-       }
 
        mfc_mem_ion_free(dev, &dev->dbg_info_buf);
        mfc_debug(2, "[MEMINFO] Release the debug info buffer\n");
-
-       return 0;
 }
 
 /* Allocation buffer of ROI macroblock information */
@@ -590,11 +524,6 @@ int mfc_alloc_firmware(struct mfc_dev *dev)
 
        mfc_debug_enter();
 
-       if (!dev) {
-               mfc_err_dev("[F/W] no mfc device to run\n");
-               return -EINVAL;
-       }
-
        buf_size = dev->variant->buf_size->ctx_buf;
        firmware_size = dev->variant->buf_size->firmware_code;
        dev->fw.size = firmware_size + buf_size->dev_ctx;
@@ -641,11 +570,6 @@ int mfc_load_firmware(struct mfc_dev *dev)
        size_t firmware_size;
        int err;
 
-       if (!dev) {
-               mfc_err_dev("[F/W] no mfc device to run\n");
-               return -EINVAL;
-       }
-
        firmware_size = dev->variant->buf_size->firmware_code;
 
        /* Firmare has to be present as a separate file or compiled
@@ -691,11 +615,6 @@ int mfc_release_firmware(struct mfc_dev *dev)
 {
        /* Before calling this function one has to make sure
         * that MFC is no longer processing */
-       if (!dev) {
-               mfc_err_dev("[F/W] no mfc device to run\n");
-               return -EINVAL;
-       }
-
        if (!dev->fw_buf.dma_buf) {
                mfc_err_dev("[F/W] firmware memory is already freed\n");
                return -EINVAL;

diff --git a/drivers/media/platform/exynos/mfc/mfc_buf.h b/drivers/media/platform/exynos/mfc/mfc_buf.h
index f5aa63f85170237cac7bd43356c82e4ced1004f1..9e7a8db946d904177ac2f32a08adaac5eb23e7b7 100644 (file)
--- a/drivers/media/platform/exynos/mfc/mfc_buf.h
+++ b/drivers/media/platform/exynos/mfc/mfc_buf.h
@@ -16,7 +16,7 @@
 #include "mfc_common.h"
 
 /* Memory allocation */
-int mfc_alloc_common_context(struct mfc_dev *dev);
+void mfc_alloc_common_context(struct mfc_dev *dev);
 void mfc_release_common_context(struct mfc_dev *dev);
 
 int mfc_alloc_instance_context(struct mfc_ctx *ctx);
@@ -36,6 +36,6 @@ int mfc_load_firmware(struct mfc_dev *dev);
 int mfc_release_firmware(struct mfc_dev *dev);
 
 int mfc_alloc_dbg_info_buffer(struct mfc_dev *dev);
-int mfc_release_dbg_info_buffer(struct mfc_dev *dev);
+void mfc_release_dbg_info_buffer(struct mfc_dev *dev);
 
 #endif /* __MFC_BUF_H */