[COMMON] media: mfc: DRV4.0: remove the unnecessary mark
authorAyoung Sim <a.sim@samsung.com>
Thu, 21 Jun 2018 23:57:34 +0000 (08:57 +0900)
committerSunyoung Kang <sy0816.kang@samsung.com>
Mon, 23 Jul 2018 06:18:42 +0000 (15:18 +0900)
Change-Id: I8b3416ff4056140e290a5aaf486b5049edce755c
Signed-off-by: Ayoung Sim <a.sim@samsung.com>
18 files changed:
drivers/media/platform/exynos/mfc/s5p_mfc.c
drivers/media/platform/exynos/mfc/s5p_mfc_buf.c
drivers/media/platform/exynos/mfc/s5p_mfc_cmd.c
drivers/media/platform/exynos/mfc/s5p_mfc_ctrl.c
drivers/media/platform/exynos/mfc/s5p_mfc_debugfs.c
drivers/media/platform/exynos/mfc/s5p_mfc_dec.c
drivers/media/platform/exynos/mfc/s5p_mfc_dec_vb2_ops.c
drivers/media/platform/exynos/mfc/s5p_mfc_enc.c
drivers/media/platform/exynos/mfc/s5p_mfc_enc_vb2_ops.c
drivers/media/platform/exynos/mfc/s5p_mfc_hwlock.c
drivers/media/platform/exynos/mfc/s5p_mfc_inst.c
drivers/media/platform/exynos/mfc/s5p_mfc_irq.c
drivers/media/platform/exynos/mfc/s5p_mfc_mmcache.c
drivers/media/platform/exynos/mfc/s5p_mfc_nal_q.c
drivers/media/platform/exynos/mfc/s5p_mfc_opr.c
drivers/media/platform/exynos/mfc/s5p_mfc_otf.c
drivers/media/platform/exynos/mfc/s5p_mfc_queue.c
drivers/media/platform/exynos/mfc/s5p_mfc_sync.c

index 205df01034894c975e626c9f3df6deadfad9fa5c..61a9462f45394fbf89fee3eb35bc40e0654d29d0 100644 (file)
@@ -337,7 +337,7 @@ static int mfc_init_instance(struct s5p_mfc_dev *dev, struct s5p_mfc_ctx *ctx)
 #ifdef CONFIG_EXYNOS_CONTENT_PATH_PROTECTION
        trace_mfc_dcpp_start(ctx->num, 1, dev->fw.drm_status);
        if (!dev->drm_fw_buf.daddr) {
-               mfc_err_ctx("DRM F/W buffer is not allocated.\n");
+               mfc_err_ctx("DRM F/W buffer is not allocated\n");
                dev->fw.drm_status = 0;
        } else {
                /* Request buffer protection for DRM F/W */
@@ -364,7 +364,7 @@ static int mfc_init_instance(struct s5p_mfc_dev *dev, struct s5p_mfc_ctx *ctx)
        MFC_TRACE_DEV_HWLOCK("**open\n");
        ret = s5p_mfc_get_hwlock_dev(dev);
        if (ret < 0) {
-               mfc_err_dev("Failed to get hwlock.\n");
+               mfc_err_dev("Failed to get hwlock\n");
                mfc_err_dev("dev.hwlock.dev = 0x%lx, bits = 0x%lx, owned_by_irq = %d, wl_count = %d, transfer_owner = %d\n",
                                dev->hwlock.dev, dev->hwlock.bits, dev->hwlock.owned_by_irq,
                                dev->hwlock.wl_count, dev->hwlock.transfer_owner);
@@ -465,7 +465,7 @@ static int s5p_mfc_open(struct file *file)
        /* Allocate memory for context */
        ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
        if (!ctx) {
-               mfc_err_dev("Not enough memory.\n");
+               mfc_err_dev("Not enough memory\n");
                ret = -ENOMEM;
                goto err_ctx_alloc;
        }
@@ -508,7 +508,7 @@ static int s5p_mfc_open(struct file *file)
        while (dev->ctx[ctx->num]) {
                ctx->num++;
                if (ctx->num >= MFC_NUM_CONTEXTS) {
-                       mfc_err_dev("Too many open contexts.\n");
+                       mfc_err_dev("Too many open contexts\n");
                        ret = -EBUSY;
                        goto err_ctx_num;
                }
@@ -638,7 +638,7 @@ static int mfc_wait_close_inst(struct s5p_mfc_dev *dev, struct s5p_mfc_ctx *ctx)
 
        /* To issue the command 'CLOSE_INSTANCE' */
        if (s5p_mfc_just_run(dev, ctx->num)) {
-               mfc_err_ctx("Failed to run MFC.\n");
+               mfc_err_ctx("Failed to run MFC\n");
                return -EIO;
        }
 
@@ -682,14 +682,14 @@ static int s5p_mfc_release(struct file *file)
        /* If a H/W operation is in progress, wait for it complete */
        if (need_to_wait_nal_abort(ctx)) {
                if (s5p_mfc_wait_for_done_ctx(ctx, S5P_FIMV_R2H_CMD_NAL_ABORT_RET)) {
-                       mfc_err_ctx("Failed to wait nal abort.\n");
+                       mfc_err_ctx("Failed to wait nal abort\n");
                        s5p_mfc_cleanup_work_bit_and_try_run(ctx);
                }
        }
        MFC_TRACE_CTX_HWLOCK("**release\n");
        ret = s5p_mfc_get_hwlock_ctx(ctx);
        if (ret < 0) {
-               mfc_err_dev("Failed to get hwlock.\n");
+               mfc_err_dev("Failed to get hwlock\n");
                mutex_unlock(&dev->mfc_mutex);
                return -EBUSY;
        }
@@ -846,10 +846,10 @@ static int s5p_mfc_mmap(struct file *file, struct vm_area_struct *vma)
        mfc_debug_enter();
 
        if (offset < DST_QUEUE_OFF_BASE) {
-               mfc_debug(2, "mmaping source.\n");
+               mfc_debug(2, "mmaping source\n");
                ret = vb2_mmap(&ctx->vq_src, vma);
        } else {                /* capture */
-               mfc_debug(2, "mmaping destination.\n");
+               mfc_debug(2, "mmaping destination\n");
                vma->vm_pgoff -= (DST_QUEUE_OFF_BASE >> PAGE_SHIFT);
                ret = vb2_mmap(&ctx->vq_dst, vma);
        }
@@ -906,7 +906,7 @@ int s5p_mfc_sysmmu_fault_handler(struct iommu_domain *iodmn, struct device *devi
                if (MFC_MMU1_READL(MFC_MMU_INTERRUPT_STATUS) &&
                                ((MFC_MMU1_READL(MFC_MMU_FAULT_TRANS_INFO) &
                                  MFC_MMU_FAULT_TRANS_INFO_AXID_MASK) == 1)) {
-                       mfc_err_dev("There is TS-MUX page fault. skip SFR dump.\n");
+                       mfc_err_dev("There is TS-MUX page fault. skip SFR dump\n");
                        return 0;
                }
        }
@@ -1200,15 +1200,15 @@ static int mfc_itmon_notifier(struct notifier_block *nb, unsigned long action, v
 
        if (is_mfc_itmon) {
                pr_err("mfc_itmon_notifier: MFC +\n");
-               pr_err("MFC is %s.\n", is_master ? "master" : "dest");
+               pr_err("MFC is %s\n", is_master ? "master" : "dest");
                if (!dev->itmon_notified) {
-                       pr_err("dump MFC information.\n");
+                       pr_err("dump MFC information\n");
                        if (is_master || (!is_master && itmon_info->onoff))
                                call_dop(dev, dump_info, dev);
                        else
                                call_dop(dev, dump_info_without_regs, dev);
                } else {
-                       pr_err("MFC notifier has already been called. skip MFC information.\n");
+                       pr_err("MFC notifier has already been called. skip MFC information\n");
                }
                pr_err("mfc_itmon_notifier: MFC -\n");
                dev->itmon_notified = 1;
@@ -1229,7 +1229,7 @@ static int s5p_mfc_probe(struct platform_device *pdev)
        dev_dbg(&pdev->dev, "%s()\n", __func__);
        dev = devm_kzalloc(&pdev->dev, sizeof(struct s5p_mfc_dev), GFP_KERNEL);
        if (!dev) {
-               dev_err(&pdev->dev, "Not enough memory for MFC device.\n");
+               dev_err(&pdev->dev, "Not enough memory for MFC device\n");
                return -ENOMEM;
        }
 
@@ -1503,7 +1503,7 @@ static void s5p_mfc_shutdown(struct platform_device *pdev)
 
        ret = s5p_mfc_get_hwlock_dev(dev);
        if (ret < 0)
-               mfc_err_dev("Failed to get hwlock.\n");
+               mfc_err_dev("Failed to get hwlock\n");
 
        if (!dev->shutdown) {
                s5p_mfc_risc_off(dev);
index 2d2b5f9be82203c5f87eca033a8743575f783f2c..1d824c33a7e274836f7514025a5c0ae6093823fc 100644 (file)
@@ -451,7 +451,7 @@ int s5p_mfc_alloc_dbg_info_buffer(struct s5p_mfc_dev *dev)
 {
        struct s5p_mfc_ctx_buf_size *buf_size = dev->variant->buf_size->ctx_buf;
 
-       mfc_debug(2, "Allocate a debug-info buffer.\n");
+       mfc_debug(2, "Allocate a debug-info buffer\n");
 
        dev->dbg_info_buf.buftype = MFCBUF_NORMAL;
        dev->dbg_info_buf.size = buf_size->dbg_info_buf;
index 1c49db999f78cf376d6ad19f775051f4b8831bb0..c744883cf3f14d78723d46b0b6efd91097c4d5de 100644 (file)
@@ -216,12 +216,12 @@ int s5p_mfc_cmd_dec_init_buffers(struct s5p_mfc_ctx *ctx)
                s5p_mfc_release_codec_buffers(ctx);
                ret = s5p_mfc_alloc_codec_buffers(ctx);
                if (ret) {
-                       mfc_err_ctx("Failed to allocate decoding buffers.\n");
+                       mfc_err_ctx("Failed to allocate decoding buffers\n");
                        return ret;
                }
                ret = s5p_mfc_set_dec_codec_buffers(ctx);
                if (ret) {
-                       mfc_err_ctx("Failed to alloc frame mem.\n");
+                       mfc_err_ctx("Failed to alloc frame mem\n");
                        return ret;
                }
        }
@@ -255,7 +255,7 @@ int s5p_mfc_cmd_enc_init_buffers(struct s5p_mfc_ctx *ctx)
                mfc_info_ctx("there isn't codec buffer, re-alloc!\n");
                ret = s5p_mfc_alloc_codec_buffers(ctx);
                if (ret) {
-                       mfc_err_ctx("Failed to allocate encoding buffers.\n");
+                       mfc_err_ctx("Failed to allocate encoding buffers\n");
                        return ret;
                }
        }
@@ -271,12 +271,12 @@ int s5p_mfc_cmd_enc_init_buffers(struct s5p_mfc_ctx *ctx)
                s5p_mfc_release_codec_buffers(ctx);
                ret = s5p_mfc_alloc_codec_buffers(ctx);
                if (ret) {
-                       mfc_err_ctx("Failed to allocate encoding buffers.\n");
+                       mfc_err_ctx("Failed to allocate encoding buffers\n");
                        return ret;
                }
                ret = s5p_mfc_set_enc_codec_buffers(ctx);
                if (ret) {
-                       mfc_err_ctx("Failed to set enc codec buffers.\n");
+                       mfc_err_ctx("Failed to set enc codec buffers\n");
                        return ret;
                }
        }
index d6970405df755732bdf0cb77838f4bb2097f2d46..0736d055cc2b3bbbca34e09b0ee57ebf75c6ee1a 100644 (file)
@@ -60,7 +60,7 @@ static int mfc_init_hw(struct s5p_mfc_dev *dev, enum mfc_buf_usage_type buf_type
 
        ret = s5p_mfc_reset_mfc(dev);
        if (ret) {
-               mfc_err_dev("Failed to reset MFC - timeout.\n");
+               mfc_err_dev("Failed to reset MFC - timeout\n");
                goto err_init_hw;
        }
        mfc_debug(2, "Done MFC reset...\n");
@@ -71,7 +71,7 @@ static int mfc_init_hw(struct s5p_mfc_dev *dev, enum mfc_buf_usage_type buf_type
        /* 2. Release reset signal to the RISC */
        s5p_mfc_risc_on(dev);
 
-       mfc_debug(2, "Will now wait for completion of firmware transfer.\n");
+       mfc_debug(2, "Will now wait for completion of firmware transfer\n");
        if (s5p_mfc_wait_for_done_dev(dev, S5P_FIMV_R2H_CMD_FW_STATUS_RET)) {
                mfc_err_dev("Failed to RISC_ON\n");
                s5p_mfc_clean_dev_int_flags(dev);
@@ -82,7 +82,7 @@ static int mfc_init_hw(struct s5p_mfc_dev *dev, enum mfc_buf_usage_type buf_type
        /* 3. Initialize firmware */
        ret = s5p_mfc_cmd_sys_init(dev, buf_type);
        if (ret) {
-               mfc_err_dev("Failed to send command to MFC - timeout.\n");
+               mfc_err_dev("Failed to send command to MFC - timeout\n");
                goto err_init_hw;
        }
 
@@ -95,11 +95,10 @@ static int mfc_init_hw(struct s5p_mfc_dev *dev, enum mfc_buf_usage_type buf_type
        }
 
        dev->int_condition = 0;
-       if (dev->int_err != 0 || dev->int_reason !=
-                                               S5P_FIMV_R2H_CMD_SYS_INIT_RET) {
+       if (dev->int_err != 0 || dev->int_reason != S5P_FIMV_R2H_CMD_SYS_INIT_RET) {
                /* Failure. */
-               mfc_err_dev("Failed to init firmware - error: %d"
-                               " int: %d.\n", dev->int_err, dev->int_reason);
+               mfc_err_dev("Failed to init firmware - error: %d, int: %d\n",
+                               dev->int_err, dev->int_reason);
                ret = -EIO;
                goto err_init_hw;
        }
@@ -237,7 +236,7 @@ int s5p_mfc_sleep(struct s5p_mfc_dev *dev)
        MFC_TRACE_DEV_HWLOCK("**sleep (ctx:%d)\n", ctx->num);
        ret = s5p_mfc_get_hwlock_dev(dev);
        if (ret < 0) {
-               mfc_err_dev("Failed to get hwlock.\n");
+               mfc_err_dev("Failed to get hwlock\n");
                mfc_err_dev("dev.hwlock.dev = 0x%lx, bits = 0x%lx, owned_by_irq = %d, wl_count = %d, transfer_owner = %d\n",
                                dev->hwlock.dev, dev->hwlock.bits, dev->hwlock.owned_by_irq,
                                dev->hwlock.wl_count, dev->hwlock.transfer_owner);
@@ -263,11 +262,10 @@ int s5p_mfc_sleep(struct s5p_mfc_dev *dev)
        }
 
        dev->int_condition = 0;
-       if (dev->int_err != 0 || dev->int_reason !=
-                                               S5P_FIMV_R2H_CMD_SLEEP_RET) {
+       if (dev->int_err != 0 || dev->int_reason != S5P_FIMV_R2H_CMD_SLEEP_RET) {
                /* Failure. */
-               mfc_err_dev("Failed to sleep - error: %d"
-                               " int: %d.\n", dev->int_err, dev->int_reason);
+               mfc_err_dev("Failed to sleep - error: %d, int: %d\n",
+                               dev->int_err, dev->int_reason);
                ret = -EIO;
                goto err_mfc_sleep;
        }
@@ -299,7 +297,7 @@ int s5p_mfc_wakeup(struct s5p_mfc_dev *dev)
        MFC_TRACE_DEV_HWLOCK("**wakeup\n");
        ret = s5p_mfc_get_hwlock_dev(dev);
        if (ret < 0) {
-               mfc_err_dev("Failed to get hwlock.\n");
+               mfc_err_dev("Failed to get hwlock\n");
                mfc_err_dev("dev.hwlock.dev = 0x%lx, bits = 0x%lx, owned_by_irq = %d, wl_count = %d, transfer_owner = %d\n",
                                dev->hwlock.dev, dev->hwlock.bits, dev->hwlock.owned_by_irq,
                                dev->hwlock.wl_count, dev->hwlock.transfer_owner);
@@ -315,7 +313,7 @@ int s5p_mfc_wakeup(struct s5p_mfc_dev *dev)
 
        ret = s5p_mfc_reset_mfc(dev);
        if (ret) {
-               mfc_err_dev("Failed to reset MFC - timeout.\n");
+               mfc_err_dev("Failed to reset MFC - timeout\n");
                goto err_mfc_wakeup;
        }
        mfc_debug(2, "Done MFC reset...\n");
@@ -330,7 +328,7 @@ int s5p_mfc_wakeup(struct s5p_mfc_dev *dev)
        /* 2. Release reset signal to the RISC */
        s5p_mfc_risc_on(dev);
 
-       mfc_debug(2, "Will now wait for completion of firmware transfer.\n");
+       mfc_debug(2, "Will now wait for completion of firmware transfer\n");
        if (s5p_mfc_wait_for_done_dev(dev, S5P_FIMV_R2H_CMD_FW_STATUS_RET)) {
                mfc_err_dev("Failed to RISC_ON\n");
                dev->logging_data->cause |= (1 << MFC_CAUSE_FAIL_RISC_ON);
@@ -341,7 +339,7 @@ int s5p_mfc_wakeup(struct s5p_mfc_dev *dev)
        mfc_debug(2, "Ok, now will write a command to wakeup the system\n");
        s5p_mfc_cmd_wakeup(dev);
 
-       mfc_debug(2, "Will now wait for completion of firmware wake up.\n");
+       mfc_debug(2, "Will now wait for completion of firmware wake up\n");
        if (s5p_mfc_wait_for_done_dev(dev, S5P_FIMV_R2H_CMD_WAKEUP_RET)) {
                mfc_err_dev("Failed to WAKEUP\n");
                dev->logging_data->cause |= (1 << MFC_CAUSE_FAIL_WAKEUP);
@@ -350,11 +348,10 @@ int s5p_mfc_wakeup(struct s5p_mfc_dev *dev)
        }
 
        dev->int_condition = 0;
-       if (dev->int_err != 0 || dev->int_reason !=
-                                               S5P_FIMV_R2H_CMD_WAKEUP_RET) {
+       if (dev->int_err != 0 || dev->int_reason != S5P_FIMV_R2H_CMD_WAKEUP_RET) {
                /* Failure. */
-               mfc_err_dev("Failed to wakeup - error: %d"
-                               " int: %d.\n", dev->int_err, dev->int_reason);
+               mfc_err_dev("Failed to wakeup - error: %d, int: %d\n",
+                               dev->int_err, dev->int_reason);
                ret = -EIO;
                goto err_mfc_wakeup;
        }
index 37cdee1c2cc4c02133c6e26e7169da6a7653a730..55e17ff0710dbd395ec3d82884bceefd48f919fe 100644 (file)
@@ -152,7 +152,7 @@ void s5p_mfc_init_debugfs(struct s5p_mfc_dev *dev)
 
        debugfs->root = debugfs_create_dir("mfc", NULL);
        if (!debugfs->root) {
-               mfc_err_dev("debugfs: failed to create root derectory.\n");
+               mfc_err_dev("debugfs: failed to create root derectory\n");
                return;
        }
 
index a54647f2366004db362ea3d850a13e7d3b0e4c87..8ea96d3dc6669587a88157d3cc56afdbc3b3f740 100644 (file)
@@ -411,7 +411,7 @@ static int vidioc_s_fmt_vid_cap_mplane(struct file *file, void *priv,
 
        ctx->dst_fmt = mfc_dec_find_format(ctx, pix_fmt_mp->pixelformat);
        if (!ctx->dst_fmt) {
-               mfc_err_ctx("Unsupported format for destination.\n");
+               mfc_err_ctx("Unsupported format for destination\n");
                return -EINVAL;
        }
        ctx->raw_buf.num_planes = ctx->dst_fmt->num_planes;
@@ -431,7 +431,7 @@ static int mfc_force_close_inst(struct s5p_mfc_dev *dev, struct s5p_mfc_ctx *ctx
        s5p_mfc_set_bit(ctx->num, &dev->work_bits);
        s5p_mfc_clean_ctx_int_flags(ctx);
        if (s5p_mfc_just_run(dev, ctx->num)) {
-               mfc_err_ctx("Failed to run MFC.\n");
+               mfc_err_ctx("Failed to run MFC\n");
                s5p_mfc_release_hwlock_ctx(ctx);
                s5p_mfc_cleanup_work_bit_and_try_run(ctx);
                return -EIO;
@@ -471,7 +471,7 @@ static int vidioc_s_fmt_vid_out_mplane(struct file *file, void *priv,
 
        ctx->src_fmt = mfc_dec_find_format(ctx, pix_fmt_mp->pixelformat);
        if (!ctx->src_fmt) {
-               mfc_err_ctx("Unsupported format for source.\n");
+               mfc_err_ctx("Unsupported format for source\n");
                return -EINVAL;
        }
 
@@ -497,7 +497,7 @@ static int vidioc_s_fmt_vid_out_mplane(struct file *file, void *priv,
        MFC_TRACE_CTX_HWLOCK("**DEC s_fmt\n");
        ret = s5p_mfc_get_hwlock_ctx(ctx);
        if (ret < 0) {
-               mfc_err_ctx("Failed to get hwlock.\n");
+               mfc_err_ctx("Failed to get hwlock\n");
                return -EBUSY;
        }
 
@@ -510,7 +510,7 @@ static int vidioc_s_fmt_vid_out_mplane(struct file *file, void *priv,
 
        ret = s5p_mfc_alloc_instance_context(ctx);
        if (ret) {
-               mfc_err_ctx("Failed to allocate dec instance[%d] buffers.\n",
+               mfc_err_ctx("Failed to allocate dec instance[%d] buffers\n",
                                ctx->num);
                s5p_mfc_release_hwlock_ctx(ctx);
                return -ENOMEM;
@@ -519,7 +519,7 @@ static int vidioc_s_fmt_vid_out_mplane(struct file *file, void *priv,
        s5p_mfc_set_bit(ctx->num, &dev->work_bits);
        ret = s5p_mfc_just_run(dev, ctx->num);
        if (ret) {
-               mfc_err_ctx("Failed to run MFC.\n");
+               mfc_err_ctx("Failed to run MFC\n");
                s5p_mfc_release_hwlock_ctx(ctx);
                s5p_mfc_cleanup_work_bit_and_try_run(ctx);
                s5p_mfc_release_instance_context(ctx);
@@ -571,7 +571,7 @@ static int vidioc_reqbufs(struct file *file, void *priv,
        }
 
        if (reqbufs->memory == V4L2_MEMORY_MMAP) {
-               mfc_err_ctx("Not supported memory type (%d).\n", reqbufs->memory);
+               mfc_err_ctx("Not supported memory type (%d)\n", reqbufs->memory);
                return -EINVAL;
        }
 
@@ -588,13 +588,13 @@ static int vidioc_reqbufs(struct file *file, void *priv,
 
                        /* Decoding */
                        if (ctx->output_state != QUEUE_FREE) {
-                               mfc_err_ctx("Bufs have already been requested.\n");
+                               mfc_err_ctx("Bufs have already been requested\n");
                                return -EINVAL;
                        }
 
                        ret = vb2_reqbufs(&ctx->vq_src, reqbufs);
                        if (ret) {
-                               mfc_err_ctx("vb2_reqbufs on output failed.\n");
+                               mfc_err_ctx("vb2_reqbufs on src failed\n");
                                return ret;
                        }
 
@@ -616,18 +616,18 @@ static int vidioc_reqbufs(struct file *file, void *priv,
                dec->dst_memtype = reqbufs->memory;
 
                if (ctx->capture_state != QUEUE_FREE) {
-                       mfc_err_ctx("Bufs have already been requested.\n");
+                       mfc_err_ctx("Bufs have already been requested\n");
                        return -EINVAL;
                }
 
                ret = vb2_reqbufs(&ctx->vq_dst, reqbufs);
                if (ret) {
-                       mfc_err_ctx("vb2_reqbufs on capture failed.\n");
+                       mfc_err_ctx("vb2_reqbufs on capture failed\n");
                        return ret;
                }
 
                if (reqbufs->count < ctx->dpb_count) {
-                       mfc_err_ctx("Not enough buffers allocated.\n");
+                       mfc_err_ctx("Not enough buffers allocated\n");
                        reqbufs->count = 0;
                        vb2_reqbufs(&ctx->vq_dst, reqbufs);
                        return -ENOMEM;
@@ -637,7 +637,7 @@ static int vidioc_reqbufs(struct file *file, void *priv,
 
                ret = s5p_mfc_alloc_codec_buffers(ctx);
                if (ret) {
-                       mfc_err_ctx("Failed to allocate decoding buffers.\n");
+                       mfc_err_ctx("Failed to allocate decoding buffers\n");
                        reqbufs->count = 0;
                        vb2_reqbufs(&ctx->vq_dst, reqbufs);
                        return -ENOMEM;
@@ -698,7 +698,7 @@ static int vidioc_qbuf(struct file *file, void *priv, struct v4l2_buffer *buf)
        mfc_debug_enter();
 
        if (ctx->state == MFCINST_ERROR) {
-               mfc_err_ctx("Call on QBUF after unrecoverable error.\n");
+               mfc_err_ctx("Call on QBUF after unrecoverable error\n");
                return -EIO;
        }
 
@@ -721,10 +721,10 @@ static int vidioc_qbuf(struct file *file, void *priv, struct v4l2_buffer *buf)
 
                if (!buf->m.planes[0].bytesused) {
                        buf->m.planes[0].bytesused = buf->m.planes[0].length;
-                       mfc_debug(2, "Src input size zero, changed to buf size %d\n",
+                       mfc_debug(2, "Src size zero, changed to buf size %d\n",
                                        buf->m.planes[0].bytesused);
                } else {
-                       mfc_debug(2, "Src input size = %d\n", buf->m.planes[0].bytesused);
+                       mfc_debug(2, "Src size = %d\n", buf->m.planes[0].bytesused);
                }
                ret = vb2_qbuf(&ctx->vq_src, buf);
        } else {
@@ -748,7 +748,7 @@ static int vidioc_dqbuf(struct file *file, void *priv, struct v4l2_buffer *buf)
        mfc_debug_enter();
 
        if (ctx->state == MFCINST_ERROR) {
-               mfc_err_ctx("Call on DQBUF after unrecoverable error.\n");
+               mfc_err_ctx("Call on DQBUF after unrecoverable error\n");
                return -EIO;
        }
        if (buf->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) {
@@ -912,7 +912,7 @@ static int mfc_dec_get_ctrl_val(struct s5p_mfc_ctx *ctx, struct v4l2_control *ct
                        ctrl->value = ctx->dpb_count;
                        break;
                } else if (ctx->state != MFCINST_INIT) {
-                       mfc_err_ctx("Decoding not initialised.\n");
+                       mfc_err_ctx("Decoding not initialised\n");
                        return -EINVAL;
                }
 
@@ -927,7 +927,7 @@ static int mfc_dec_get_ctrl_val(struct s5p_mfc_ctx *ctx, struct v4l2_control *ct
                    ctx->state < MFCINST_ABORT) {
                        ctrl->value = ctx->dpb_count;
                } else {
-                       mfc_err_ctx("Decoding not initialised.\n");
+                       mfc_err_ctx("Decoding not initialised\n");
                        return -EINVAL;
                }
                break;
@@ -1100,7 +1100,7 @@ static int vidioc_s_ctrl(struct file *file, void *priv,
        case V4L2_CID_MPEG_MFC_SET_DYNAMIC_DPB_MODE:
                dec->is_dynamic_dpb = ctrl->value;
                if (dec->is_dynamic_dpb == 0)
-                       mfc_err_dev("[DPB] is_dynamic_dpb is 0. it has to be enabled.\n");
+                       mfc_err_dev("[DPB] is_dynamic_dpb is 0. it has to be enabled\n");
                break;
        case V4L2_CID_MPEG_MFC_SET_USER_SHARED_HANDLE:
                if (dec->sh_handle.fd == -1) {
index 962f53b130efd4bb625c252674bde8c93f5e7dd5..50c1735f1d8a0aae01bc8f82f9d7cd21b95d8dec 100644 (file)
@@ -214,7 +214,7 @@ static int s5p_mfc_dec_buf_init(struct vb2_buffer *vb)
                                        vb->index) < 0)
                        mfc_err_ctx("failed in init_buf_ctrls\n");
        } else {
-               mfc_err_ctx("s5p_mfc_dec_buf_init: unknown queue type.\n");
+               mfc_err_ctx("s5p_mfc_dec_buf_init: unknown queue type\n");
                return -EINVAL;
        }
 
@@ -325,7 +325,7 @@ static void s5p_mfc_dec_buf_cleanup(struct vb2_buffer *vb)
                                        MFC_CTRL_TYPE_SRC, index) < 0)
                        mfc_err_ctx("failed in cleanup_buf_ctrls\n");
        } else {
-               mfc_err_ctx("s5p_mfc_dec_buf_cleanup: unknown queue type.\n");
+               mfc_err_ctx("s5p_mfc_dec_buf_cleanup: unknown queue type\n");
        }
 
        mfc_debug_leave();
@@ -402,7 +402,7 @@ static void mfc_dec_src_stop_streaming(struct s5p_mfc_ctx *ctx)
 
                                ret = s5p_mfc_just_run(dev, ctx->num);
                                if (ret) {
-                                       mfc_err_ctx("Failed to run MFC.\n");
+                                       mfc_err_ctx("Failed to run MFC\n");
                                } else {
                                        if (s5p_mfc_wait_for_done_ctx(ctx, condition))
                                                mfc_err_ctx("special parsing time out\n");
@@ -506,7 +506,7 @@ static void s5p_mfc_dec_stop_streaming(struct vb2_queue *q)
        /* If a H/W operation is in progress, wait for it complete */
        ret = s5p_mfc_get_hwlock_ctx(ctx);
        if (ret < 0) {
-               mfc_err_ctx("Failed to get hwlock.\n");
+               mfc_err_ctx("Failed to get hwlock\n");
                return;
        }
 
@@ -526,7 +526,7 @@ static void s5p_mfc_dec_stop_streaming(struct vb2_queue *q)
                mfc_info_ctx("try to DPB flush\n");
                ret = s5p_mfc_just_run(dev, ctx->num);
                if (ret) {
-                       mfc_err_ctx("Failed to run MFC.\n");
+                       mfc_err_ctx("Failed to run MFC\n");
                        s5p_mfc_release_hwlock_ctx(ctx);
                        s5p_mfc_cleanup_work_bit_and_try_run(ctx);
                        return;
index e57824612cc325e71b0022bd1a042a2c2eee0c03..87e7983aab966ca611777172abed0b65160a6bac 100644 (file)
@@ -308,7 +308,7 @@ static int vidioc_s_fmt_vid_cap_mplane(struct file *file, void *priv,
 
        ctx->dst_fmt = mfc_enc_find_format(ctx, pix_fmt_mp->pixelformat);
        if (!ctx->dst_fmt) {
-               mfc_err_ctx("Unsupported format for destination.\n");
+               mfc_err_ctx("Unsupported format for destination\n");
                return -EINVAL;
        }
 
@@ -334,7 +334,7 @@ static int vidioc_s_fmt_vid_cap_mplane(struct file *file, void *priv,
 
        ret = s5p_mfc_alloc_instance_context(ctx);
        if (ret) {
-               mfc_err_ctx("Failed to allocate enc instance[%d] buffers.\n",
+               mfc_err_ctx("Failed to allocate enc instance[%d] buffers\n",
                                ctx->num);
                return -ENOMEM;
        }
@@ -354,7 +354,7 @@ static int vidioc_s_fmt_vid_cap_mplane(struct file *file, void *priv,
 
        ret = s5p_mfc_get_hwlock_ctx(ctx);
        if (ret < 0) {
-               mfc_err_dev("Failed to get hwlock.\n");
+               mfc_err_dev("Failed to get hwlock\n");
                s5p_mfc_release_instance_context(ctx);
                s5p_mfc_release_enc_roi_buffer(ctx);
                return -EBUSY;
@@ -363,7 +363,7 @@ static int vidioc_s_fmt_vid_cap_mplane(struct file *file, void *priv,
        s5p_mfc_set_bit(ctx->num, &dev->work_bits);
        ret = s5p_mfc_just_run(dev, ctx->num);
        if (ret) {
-               mfc_err_ctx("Failed to run MFC.\n");
+               mfc_err_ctx("Failed to run MFC\n");
                s5p_mfc_release_hwlock_ctx(ctx);
                s5p_mfc_cleanup_work_bit_and_try_run(ctx);
                s5p_mfc_release_instance_context(ctx);
@@ -415,7 +415,7 @@ static int vidioc_s_fmt_vid_out_mplane(struct file *file, void *priv,
 
        ctx->src_fmt = mfc_enc_find_format(ctx, pix_fmt_mp->pixelformat);
        if (!ctx->src_fmt) {
-               mfc_err_ctx("Unsupported format for source.\n");
+               mfc_err_ctx("Unsupported format for source\n");
                return -EINVAL;
        }
 
@@ -522,7 +522,7 @@ static int vidioc_reqbufs(struct file *file, void *priv,
        mfc_debug_enter();
 
        if (reqbufs->memory == V4L2_MEMORY_MMAP) {
-               mfc_err_ctx("Not supported memory type (%d).\n", reqbufs->memory);
+               mfc_err_ctx("Not supported memory type (%d)\n", reqbufs->memory);
                return -EINVAL;
        }
 
@@ -632,7 +632,7 @@ static int vidioc_qbuf(struct file *file, void *priv, struct v4l2_buffer *buf)
        }
 
        if (ctx->state == MFCINST_ERROR) {
-               mfc_err_ctx("Call on QBUF after unrecoverable error.\n");
+               mfc_err_ctx("Call on QBUF after unrecoverable error\n");
                return -EIO;
        }
 
@@ -678,7 +678,7 @@ static int vidioc_dqbuf(struct file *file, void *priv, struct v4l2_buffer *buf)
        }
 
        if (ctx->state == MFCINST_ERROR) {
-               mfc_err_ctx("Call on DQBUF after unrecoverable error.\n");
+               mfc_err_ctx("Call on DQBUF after unrecoverable error\n");
                return -EIO;
        }
        if (buf->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) {
index 6648d8a4e4b24b03df0b9b55f779f582f3881348..745e7ce7fdd03ef2330cdd9aba665f5b5962ba1a 100644 (file)
@@ -248,7 +248,7 @@ static int s5p_mfc_enc_buf_prepare(struct vb2_buffer *vb)
                                dma_buf_put(dmabuf[i]);
                                start_raw = s5p_mfc_mem_get_daddr_vb(vb, 0);
                                if (start_raw == 0) {
-                                       mfc_err_ctx("Plane mem not allocated.\n");
+                                       mfc_err_ctx("Plane mem not allocated\n");
                                        return -ENOMEM;
                                }
                                if (ctx->src_fmt->fourcc == V4L2_PIX_FMT_NV12N) {
@@ -320,7 +320,7 @@ static void s5p_mfc_enc_buf_cleanup(struct vb2_buffer *vb)
                                        MFC_CTRL_TYPE_SRC, index) < 0)
                        mfc_err_ctx("failed in cleanup_buf_ctrls\n");
        } else {
-               mfc_err_ctx("s5p_mfc_enc_buf_cleanup: unknown queue type.\n");
+               mfc_err_ctx("s5p_mfc_enc_buf_cleanup: unknown queue type\n");
        }
 
        mfc_debug_leave();
@@ -364,7 +364,7 @@ static void s5p_mfc_enc_stop_streaming(struct vb2_queue *q)
        MFC_TRACE_CTX_HWLOCK("**ENC streamoff(type:%d)\n", q->type);
        ret = s5p_mfc_get_hwlock_ctx(ctx);
        if (ret < 0) {
-               mfc_err_ctx("Failed to get hwlock.\n");
+               mfc_err_ctx("Failed to get hwlock\n");
                return;
        }
 
@@ -386,7 +386,7 @@ static void s5p_mfc_enc_stop_streaming(struct vb2_queue *q)
                        while (s5p_mfc_get_buf(&ctx->buf_queue_lock, &ctx->dst_buf_queue, MFC_BUF_NO_TOUCH_USED)) {
                                ret = s5p_mfc_just_run(dev, ctx->num);
                                if (ret) {
-                                       mfc_err_ctx("Failed to run MFC.\n");
+                                       mfc_err_ctx("Failed to run MFC\n");
                                        break;
                                }
                                if (s5p_mfc_wait_for_done_ctx(ctx, S5P_FIMV_R2H_CMD_FRAME_DONE_RET)) {
index 91baf6b8a98aa9b0bd77f7b5369de3f2c1d5815d..e74c91ccaae8ad412dbf8f48d3eb7d67391b76dd 100644 (file)
@@ -150,7 +150,7 @@ int s5p_mfc_get_hwlock_dev(struct s5p_mfc_dev *dev)
        mfc_print_hwlock(dev);
 
        if (dev->shutdown) {
-               mfc_info_dev("Couldn't lock HW. Shutdown was called.\n");
+               mfc_info_dev("Couldn't lock HW. Shutdown was called\n");
                spin_unlock_irqrestore(&dev->hwlock.lock, flags);
                mutex_unlock(&dev->hwlock_wq.wait_mutex);
                return -EINVAL;
@@ -162,7 +162,7 @@ int s5p_mfc_get_hwlock_dev(struct s5p_mfc_dev *dev)
 
                spin_unlock_irqrestore(&dev->hwlock.lock, flags);
 
-               mfc_debug(2, "Waiting for hwlock to be released.\n");
+               mfc_debug(2, "Waiting for hwlock to be released\n");
 
                ret = wait_event_timeout(dev->hwlock_wq.wait_queue,
                        ((dev->hwlock.transfer_owner == 1) && (dev->hwlock.dev == 1)),
@@ -236,7 +236,7 @@ int s5p_mfc_get_hwlock_ctx(struct s5p_mfc_ctx *curr_ctx)
        mfc_print_hwlock(dev);
 
        if (dev->shutdown) {
-               mfc_info_dev("Couldn't lock HW. Shutdown was called.\n");
+               mfc_info_dev("Couldn't lock HW. Shutdown was called\n");
                spin_unlock_irqrestore(&dev->hwlock.lock, flags);
                mutex_unlock(&curr_ctx->hwlock_wq.wait_mutex);
                return -EINVAL;
@@ -253,7 +253,7 @@ int s5p_mfc_get_hwlock_ctx(struct s5p_mfc_ctx *curr_ctx)
                                dev->hwlock.dev, dev->hwlock.bits, dev->hwlock.owned_by_irq,
                                dev->hwlock.wl_count, dev->hwlock.transfer_owner);
 
-               mfc_debug(2, "Waiting for hwlock to be released.\n");
+               mfc_debug(2, "Waiting for hwlock to be released\n");
 
                ret = wait_event_timeout(curr_ctx->hwlock_wq.wait_queue,
                        ((dev->hwlock.transfer_owner == 1) && (test_bit(curr_ctx->num, &dev->hwlock.bits))),
@@ -323,13 +323,13 @@ int s5p_mfc_release_hwlock_dev(struct s5p_mfc_dev *dev)
        dev->hwlock.owned_by_irq = 0;
 
        if (dev->shutdown) {
-               mfc_debug(2, "Couldn't wakeup module. Shutdown was called.\n");
+               mfc_debug(2, "Couldn't wakeup module. Shutdown was called\n");
                ret = 0;
        } else if (list_empty(&dev->hwlock.waiting_list)) {
-               mfc_debug(2, "No waiting module.\n");
+               mfc_debug(2, "No waiting module\n");
                ret = 0;
        } else {
-               mfc_debug(2, "There is a waiting module.\n");
+               mfc_debug(2, "There is a waiting module\n");
                listable_wq = list_entry(dev->hwlock.waiting_list.next, struct s5p_mfc_listable_wq, list);
                list_del(&listable_wq->list);
                dev->hwlock.wl_count--;
@@ -344,7 +344,7 @@ int s5p_mfc_release_hwlock_dev(struct s5p_mfc_dev *dev)
 
                dev->hwlock.transfer_owner = 1;
 
-               MFC_TRACE_DEV_HWLOCK("release_hwlock_dev: wakeup.\n");
+               MFC_TRACE_DEV_HWLOCK("release_hwlock_dev: wakeup\n");
                MFC_TRACE_DEV_HWLOCK(">>dev:0x%lx, bits:0x%lx, owned:%d, wl:%d, trans:%d\n",
                                dev->hwlock.dev, dev->hwlock.bits, dev->hwlock.owned_by_irq,
                                dev->hwlock.wl_count, dev->hwlock.transfer_owner);
@@ -388,13 +388,13 @@ static int mfc_release_hwlock_ctx_protected(struct s5p_mfc_ctx *curr_ctx)
        dev->hwlock.owned_by_irq = 0;
 
        if (dev->shutdown) {
-               mfc_debug(2, "Couldn't wakeup module. Shutdown was called.\n");
+               mfc_debug(2, "Couldn't wakeup module. Shutdown was called\n");
                ret = 0;
        } else if (list_empty(&dev->hwlock.waiting_list)) {
-               mfc_debug(2, "No waiting module.\n");
+               mfc_debug(2, "No waiting module\n");
                ret = 0;
        } else {
-               mfc_debug(2, "There is a waiting module.\n");
+               mfc_debug(2, "There is a waiting module\n");
                listable_wq = list_entry(dev->hwlock.waiting_list.next, struct s5p_mfc_listable_wq, list);
                list_del(&listable_wq->list);
                dev->hwlock.wl_count--;
@@ -409,7 +409,7 @@ static int mfc_release_hwlock_ctx_protected(struct s5p_mfc_ctx *curr_ctx)
 
                dev->hwlock.transfer_owner = 1;
 
-               MFC_TRACE_CTX_HWLOCK("release_hwlock_ctx: wakeup.\n");
+               MFC_TRACE_CTX_HWLOCK("release_hwlock_ctx: wakeup\n");
                MFC_TRACE_CTX_HWLOCK(">>dev:0x%lx, bits:0x%lx, owned:%d, wl:%d, trans:%d\n",
                                dev->hwlock.dev, dev->hwlock.bits, dev->hwlock.owned_by_irq,
                                dev->hwlock.wl_count, dev->hwlock.transfer_owner);
@@ -506,19 +506,19 @@ static int mfc_try_to_get_new_ctx_protected(struct s5p_mfc_dev *dev)
        }
 
        if (dev->shutdown) {
-               mfc_info_dev("Couldn't lock HW. Shutdown was called.\n");
+               mfc_info_dev("Couldn't lock HW. Shutdown was called\n");
                return -EINVAL;
        }
 
        if (dev->sleep) {
-               mfc_info_dev("Couldn't lock HW. Sleep was called.\n");
+               mfc_info_dev("Couldn't lock HW. Sleep was called\n");
                return -EINVAL;
        }
 
        /* Check whether hardware is not running */
        if ((dev->hwlock.bits != 0) || (dev->hwlock.dev != 0)) {
                /* This is perfectly ok, the scheduled ctx should wait */
-               mfc_debug(2, "Couldn't lock HW.\n");
+               mfc_debug(2, "Couldn't lock HW\n");
                return -1;
        }
 
@@ -528,7 +528,7 @@ static int mfc_try_to_get_new_ctx_protected(struct s5p_mfc_dev *dev)
                /* This is perfectly ok, the scheduled ctx should wait
                 * No contexts to run
                 */
-               mfc_debug(2, "No ctx is scheduled to be run.\n");
+               mfc_debug(2, "No ctx is scheduled to be run\n");
                ret = -1;
                return ret;
        }
@@ -568,7 +568,7 @@ void s5p_mfc_try_run(struct s5p_mfc_dev *dev)
 
        new_ctx_index = mfc_try_to_get_new_ctx_protected(dev);
        if (new_ctx_index < 0) {
-               mfc_debug(2, "Failed to get new context to run.\n");
+               mfc_debug(2, "Failed to get new context to run\n");
                mfc_print_hwlock(dev);
                spin_unlock_irqrestore(&dev->hwlock.lock, flags);
                return;
@@ -686,7 +686,7 @@ static int mfc_nal_q_just_run(struct s5p_mfc_ctx *ctx, int need_cache_flush)
                        mfc_info_ctx("[NALQ] stop NAL QUEUE\n");
                        if (s5p_mfc_wait_for_done_dev(dev,
                                        S5P_FIMV_R2H_CMD_COMPLETE_QUEUE_RET)) {
-                               mfc_err_dev("[NALQ] Failed to stop queue.\n");
+                               mfc_err_dev("[NALQ] Failed to stop queue\n");
                                dev->logging_data->cause |= (1 << MFC_CAUSE_FAIL_STOP_NAL_Q);
                                call_dop(dev, dump_and_stop_always, dev);
                        }
index 463b11b7423ba069341d96b6dcdc3d7980b2a6c2..1e9c130a16dba3550d0a2059f5b0ebc3d0b51ec4 100644 (file)
@@ -48,7 +48,7 @@ int s5p_mfc_open_inst(struct s5p_mfc_ctx *ctx)
 
        ret = s5p_mfc_cmd_open_inst(ctx);
        if (ret) {
-               mfc_err_ctx("Failed to create a new instance.\n");
+               mfc_err_ctx("Failed to create a new instance\n");
                s5p_mfc_change_state(ctx, MFCINST_ERROR);
        }
 
@@ -69,7 +69,7 @@ int s5p_mfc_close_inst(struct s5p_mfc_ctx *ctx)
 
        ret = s5p_mfc_cmd_close_inst(ctx);
        if (ret) {
-               mfc_err_ctx("Failed to return an instance.\n");
+               mfc_err_ctx("Failed to return an instance\n");
                s5p_mfc_change_state(ctx, MFCINST_ERROR);
        }
 
@@ -257,7 +257,7 @@ int s5p_mfc_decode_one_frame(struct s5p_mfc_ctx *ctx, int last_frame)
                break;
        }
 
-       mfc_debug(2, "Decoding a usual frame.\n");
+       mfc_debug(2, "Decoding a usual frame\n");
        return 0;
 }
 
@@ -282,7 +282,7 @@ int s5p_mfc_init_encode(struct s5p_mfc_ctx *ctx)
        else if (IS_BPG_ENC(ctx))
                s5p_mfc_set_enc_params_bpg(ctx);
        else {
-               mfc_err_ctx("Unknown codec for encoding (%x).\n",
+               mfc_err_ctx("Unknown codec for encoding (%x)\n",
                        ctx->codec_mode);
                return -EINVAL;
        }
index 539377b22307657ae73bfb39764d4788e2b66035..dba7417f2c5ee47493eb31b561f59aa8535ac264 100644 (file)
@@ -450,13 +450,13 @@ static void mfc_handle_frame_error(struct s5p_mfc_ctx *ctx,
        src_mb = s5p_mfc_get_del_buf(&ctx->buf_queue_lock, &ctx->src_buf_queue, MFC_BUF_NO_TOUCH_USED);
 
        if (!src_mb) {
-               mfc_err_dev("no src buffers.\n");
+               mfc_err_dev("no src buffers\n");
        } else {
                index = src_mb->vb.vb2_buf.index;
                if (call_cop(ctx, recover_buf_ctrls_val, ctx, &ctx->src_ctrls[index]) < 0)
                        mfc_err_ctx("failed in recover_buf_ctrls_val\n");
 
-               mfc_debug(2, "MFC needs next buffer.\n");
+               mfc_debug(2, "MFC needs next buffer\n");
                dec->consumed = 0;
 
                if (call_cop(ctx, get_buf_ctrls_val, ctx, &ctx->src_ctrls[index]) < 0)
@@ -469,7 +469,7 @@ static void mfc_handle_frame_error(struct s5p_mfc_ctx *ctx,
                vb2_buffer_done(&src_mb->vb.vb2_buf, VB2_BUF_STATE_ERROR);
        }
 
-       mfc_debug(2, "Assesing whether this context should be run again.\n");
+       mfc_debug(2, "Assesing whether this context should be run again\n");
 }
 
 static void mfc_handle_ref_frame(struct s5p_mfc_ctx *ctx)
@@ -538,7 +538,7 @@ static void mfc_handle_frame_input(struct s5p_mfc_ctx *ctx, unsigned int err)
                 * For non-paired field, the same buffer need to be
                 * resubmitted and the consumed stream will be 0
                 */
-               mfc_debug(2, "Not paired field. Running again the same buffer.\n");
+               mfc_debug(2, "Not paired field. Running again the same buffer\n");
                return;
        }
 
@@ -546,7 +546,7 @@ static void mfc_handle_frame_input(struct s5p_mfc_ctx *ctx, unsigned int err)
        src_mb = s5p_mfc_get_del_if_consumed(ctx, &ctx->src_buf_queue,
                        s5p_mfc_get_consumed_stream(), STUFF_BYTE, err, &deleted);
        if (!src_mb) {
-               mfc_err_dev("no src buffers.\n");
+               mfc_err_dev("no src buffers\n");
                return;
        }
 
@@ -647,8 +647,8 @@ static void mfc_handle_frame(struct s5p_mfc_ctx *ctx,
 
        if (IS_H264_DEC(ctx) && sei_avail_frame_pack &&
                dst_frame_status == S5P_FIMV_DEC_STATUS_DECODING_ONLY) {
-               mfc_debug(2, "Frame packing SEI exists for a frame.\n");
-               mfc_debug(2, "Reallocate DPBs and issue init_buffer.\n");
+               mfc_debug(2, "Frame packing SEI exists for a frame\n");
+               mfc_debug(2, "Reallocate DPBs and issue init_buffer\n");
                ctx->is_dpb_realloc = 1;
                s5p_mfc_change_state(ctx, MFCINST_HEAD_PARSED);
                ctx->capture_state = QUEUE_FREE;
@@ -662,7 +662,7 @@ static void mfc_handle_frame(struct s5p_mfc_ctx *ctx,
                if (ctx->state == MFCINST_RES_CHANGE_FLUSH) {
                        struct mfc_timestamp *temp_ts = NULL;
 
-                       mfc_debug(2, "[DRC] Last frame received after resolution change.\n");
+                       mfc_debug(2, "[DRC] Last frame received after resolution change\n");
                        mfc_handle_frame_all_extracted(ctx);
                        s5p_mfc_change_state(ctx, MFCINST_RES_CHANGE_END);
                        /* If there is no display frame after resolution change,
@@ -715,14 +715,14 @@ static void mfc_handle_frame(struct s5p_mfc_ctx *ctx,
        if (s5p_mfc_dec_status_display(dst_frame_status))
                mfc_handle_frame_new(ctx, err);
        else
-               mfc_debug(2, "No frame decode.\n");
+               mfc_debug(2, "No frame decode\n");
 
        /* Mark source buffer as complete */
        if (dst_frame_status != S5P_FIMV_DEC_STATUS_DISPLAY_ONLY)
                mfc_handle_frame_input(ctx, err);
 
 leave_handle_frame:
-       mfc_debug(2, "Assesing whether this context should be run again.\n");
+       mfc_debug(2, "Assesing whether this context should be run again\n");
 }
 
 static void mfc_handle_stream_copy_timestamp(struct s5p_mfc_ctx *ctx, struct s5p_mfc_buf *src_mb)
@@ -876,7 +876,7 @@ static void mfc_handle_stream_output(struct s5p_mfc_ctx *ctx, int slice_type,
        dst_mb = s5p_mfc_get_del_buf(&ctx->buf_queue_lock,
                        &ctx->dst_buf_queue, MFC_BUF_NO_TOUCH_USED);
        if (!dst_mb) {
-               mfc_err_ctx("no dst buffers.\n");
+               mfc_err_ctx("no dst buffers\n");
                return;
        }
 
@@ -1035,7 +1035,7 @@ static inline void mfc_handle_error(struct s5p_mfc_ctx *ctx,
                s5p_mfc_cleanup_queue(&ctx->buf_queue_lock, &ctx->src_buf_queue);
                break;
        default:
-               mfc_err_ctx("Encountered an error interrupt which had not been handled.\n");
+               mfc_err_ctx("Encountered an error interrupt which had not been handled\n");
                mfc_err_ctx("ctx->state = %d, ctx->inst_no = %d\n",
                                                ctx->state, ctx->inst_no);
                break;
@@ -1145,7 +1145,7 @@ static int mfc_handle_seq_enc(struct s5p_mfc_ctx *ctx)
        if (IS_BPG_ENC(ctx)) {
                dst_mb = s5p_mfc_get_buf(&ctx->buf_queue_lock, &ctx->dst_buf_queue, MFC_BUF_NO_TOUCH_USED);
                if (!dst_mb) {
-                       mfc_err_dev("no dst buffers.\n");
+                       mfc_err_dev("no dst buffers\n");
                        return -EAGAIN;
                }
 
@@ -1162,7 +1162,7 @@ static int mfc_handle_seq_enc(struct s5p_mfc_ctx *ctx)
                        dst_mb = s5p_mfc_get_del_buf(&ctx->buf_queue_lock,
                                        &ctx->dst_buf_queue, MFC_BUF_NO_TOUCH_USED);
                        if (!dst_mb) {
-                               mfc_err_dev("no dst buffers.\n");
+                               mfc_err_dev("no dst buffers\n");
                                return -EAGAIN;
                        }
 
@@ -1194,7 +1194,7 @@ static int mfc_handle_seq_enc(struct s5p_mfc_ctx *ctx)
        }
        ret = s5p_mfc_alloc_codec_buffers(ctx);
        if (ret) {
-               mfc_err_ctx("Failed to allocate encoding buffers.\n");
+               mfc_err_ctx("Failed to allocate encoding buffers\n");
                return ret;
        }
 
index a5a07b7888d706927e9767c1d994f6e71b228529..416bfbb83fda329d14f6500534064ea33d7940c2 100644 (file)
@@ -219,7 +219,7 @@ void s5p_mfc_invalidate_mmcache(struct s5p_mfc_dev *dev)
                        break;
                }
                if (time_after(jiffies, timeout)) {
-                       mfc_err_dev("[MMCACHE] Timeout while invalidation.\n");
+                       mfc_err_dev("[MMCACHE] Timeout while invalidation\n");
                        call_dop(dev, dump_and_stop_debug_mode, dev);
                        break;
                }
index 64c284cfb5b94ae133bea988c7af8e3e7ca55f70..a4fd952aecfcda2f84ed88fe9fa1490c7cd65b32 100644 (file)
@@ -64,7 +64,7 @@ int s5p_mfc_nal_q_check_enable(struct s5p_mfc_dev *dev)
                        }
                        /* NAL-Q doesn't support OTF mode */
                        if (temp_ctx->otf_handle) {
-                               mfc_debug(2, "There is a OTF node.\n");
+                               mfc_debug(2, "There is a OTF node\n");
                                return 0;
                        }
                        /* NAL-Q doesn't support BPG */
@@ -158,7 +158,7 @@ void s5p_mfc_nal_q_clock_off(struct s5p_mfc_dev *dev, nal_queue_handle *nal_q_ha
        mfc_debug(2, "[NALQ] nal_q_clk_cnt = %d\n", nal_q_handle->nal_q_clk_cnt);
 
        if (!nal_q_handle->nal_q_clk_cnt) {
-               mfc_err_dev("[NALQ] nal_q_clk_cnt is already zero.\n");
+               mfc_err_dev("[NALQ] nal_q_clk_cnt is already zero\n");
                return;
        }
 
@@ -1185,7 +1185,7 @@ static void mfc_nal_q_handle_frame_copy_timestamp(struct s5p_mfc_ctx *ctx, Decod
        /* Get the next source buffer */
        src_mb = s5p_mfc_get_buf(&ctx->buf_queue_lock, &ctx->src_buf_nal_queue, MFC_BUF_NO_TOUCH_USED);
        if (!src_mb) {
-               mfc_err_dev("[NALQ] no src buffers.\n");
+               mfc_err_dev("[NALQ] no src buffers\n");
                return;
        }
 
@@ -1442,7 +1442,7 @@ static void mfc_nal_q_handle_frame_input(struct s5p_mfc_ctx *ctx, unsigned int e
        src_mb = s5p_mfc_get_del_if_consumed(ctx, &ctx->src_buf_nal_queue,
                        consumed, STUFF_BYTE, err, &deleted);
        if (!src_mb) {
-               mfc_err_dev("[NALQ] no src buffers.\n");
+               mfc_err_dev("[NALQ] no src buffers\n");
                return;
        }
 
@@ -1452,7 +1452,7 @@ static void mfc_nal_q_handle_frame_input(struct s5p_mfc_ctx *ctx, unsigned int e
 
        if (!deleted) {
                /* Run MFC again on the same buffer */
-               mfc_debug(2, "[NALQ][MULTIFRAME] Running again the same buffer.\n");
+               mfc_debug(2, "[NALQ][MULTIFRAME] Running again the same buffer\n");
 
                if (CODEC_MULTIFRAME(ctx))
                        dec->y_addr_for_pb = (dma_addr_t)pOutStr->DecodedAddr[0];
@@ -1582,7 +1582,7 @@ void mfc_nal_q_handle_frame(struct s5p_mfc_ctx *ctx, DecoderOutputStr *pOutStr)
        if (s5p_mfc_dec_status_display(dst_frame_status))
                mfc_nal_q_handle_frame_new(ctx, err, pOutStr);
        else
-               mfc_debug(2, "[NALQ] No display frame.\n");
+               mfc_debug(2, "[NALQ] No display frame\n");
 
        /* Mark source buffer as complete */
        if (dst_frame_status != S5P_FIMV_DEC_STATUS_DISPLAY_ONLY)
@@ -1631,7 +1631,7 @@ int mfc_nal_q_handle_error(struct s5p_mfc_ctx *ctx, EncoderOutputStr *pOutStr, i
                                &ctx->src_buf_nal_queue, MFC_BUF_NO_TOUCH_USED);
 
                if (!src_mb) {
-                       mfc_err_dev("[NALQ] no src buffers.\n");
+                       mfc_err_dev("[NALQ] no src buffers\n");
                } else {
                        dec->consumed = 0;
                        vb2_buffer_done(&src_mb->vb.vb2_buf, VB2_BUF_STATE_ERROR);
@@ -1652,7 +1652,7 @@ int mfc_nal_q_handle_error(struct s5p_mfc_ctx *ctx, EncoderOutputStr *pOutStr, i
                                        &ctx->src_buf_nal_queue, MFC_BUF_NO_TOUCH_USED);
 
                        if (!src_mb)
-                               mfc_err_dev("[NALQ] no src buffers.\n");
+                               mfc_err_dev("[NALQ] no src buffers\n");
                        else
                                vb2_buffer_done(&src_mb->vb.vb2_buf, VB2_BUF_STATE_ERROR);
 
index f4cdc83c7b7f5d62ab02f78d49eb0a0372c2d8fa..31ed9ada52f9455c332441c6f2d30118de557027 100644 (file)
@@ -40,11 +40,11 @@ int s5p_mfc_run_dec_init(struct s5p_mfc_ctx *ctx)
        /* Get the next source buffer */
        src_mb = s5p_mfc_get_buf(&ctx->buf_queue_lock, &ctx->src_buf_queue, MFC_BUF_NO_TOUCH_USED);
        if (!src_mb) {
-               mfc_err_dev("no src buffers.\n");
+               mfc_err_dev("no src buffers\n");
                return -EAGAIN;
        }
 
-       mfc_debug(2, "Preparing to init decoding.\n");
+       mfc_debug(2, "Preparing to init decoding\n");
        mfc_debug(2, "Header size: %d, (offset: %lu)\n",
                src_mb->vb.vb2_buf.planes[0].bytesused, dec->consumed);
 
@@ -108,7 +108,7 @@ int s5p_mfc_run_dec_frame(struct s5p_mfc_ctx *ctx)
        /* Get the next source buffer */
        src_mb = s5p_mfc_get_buf(&ctx->buf_queue_lock, &ctx->src_buf_queue, MFC_BUF_SET_USED);
        if (!src_mb) {
-               mfc_debug(2, "no src buffers.\n");
+               mfc_debug(2, "no src buffers\n");
                return -EAGAIN;
        }
 
@@ -182,7 +182,7 @@ int s5p_mfc_run_dec_last_frames(struct s5p_mfc_ctx *ctx)
 
        /* Frames are being decoded */
        if (!src_mb) {
-               mfc_debug(2, "no src buffers.\n");
+               mfc_debug(2, "no src buffers\n");
                s5p_mfc_set_dec_stream_buffer(ctx, 0, 0, 0);
        } else {
                if (dec->consumed) {
@@ -221,7 +221,7 @@ int s5p_mfc_run_enc_init(struct s5p_mfc_ctx *ctx)
 
        dst_mb = s5p_mfc_get_buf(&ctx->buf_queue_lock, &ctx->dst_buf_queue, MFC_BUF_NO_TOUCH_USED);
        if (!dst_mb) {
-               mfc_debug(2, "no dst buffers.\n");
+               mfc_debug(2, "no dst buffers\n");
                return -EAGAIN;
        }
 
@@ -255,7 +255,7 @@ int s5p_mfc_run_enc_frame(struct s5p_mfc_ctx *ctx)
        /* Get the next source buffer */
        src_mb = s5p_mfc_get_buf(&ctx->buf_queue_lock, &ctx->src_buf_queue, MFC_BUF_SET_USED);
        if (!src_mb) {
-               mfc_debug(2, "no src buffers.\n");
+               mfc_debug(2, "no src buffers\n");
                return -EAGAIN;
        }
 
@@ -277,7 +277,7 @@ int s5p_mfc_run_enc_frame(struct s5p_mfc_ctx *ctx)
 
        dst_mb = s5p_mfc_get_buf(&ctx->buf_queue_lock, &ctx->dst_buf_queue, MFC_BUF_SET_USED);
        if (!dst_mb) {
-               mfc_debug(2, "no dst buffers.\n");
+               mfc_debug(2, "no dst buffers\n");
                return -EAGAIN;
        }
 
@@ -311,7 +311,7 @@ int s5p_mfc_run_enc_last_frames(struct s5p_mfc_ctx *ctx)
 
        dst_mb = s5p_mfc_get_buf(&ctx->buf_queue_lock, &ctx->dst_buf_queue, MFC_BUF_SET_USED);
        if (!dst_mb) {
-               mfc_debug(2, "no dst buffers.\n");
+               mfc_debug(2, "no dst buffers\n");
                return -EAGAIN;
        }
 
index 464ec70d013ab8601717133c78485f949042df54..62ba98a6b22df60142dcd5fa4749f69e8a0cb642 100644 (file)
@@ -391,7 +391,7 @@ int s5p_mfc_otf_ctx_ready(struct s5p_mfc_ctx *ctx)
 
        if (ctx->state == MFCINST_RUNNING && handle->otf_work_bit)
                return 1;
-       mfc_debug(2, "[OTF] ctx is not ready.\n");
+       mfc_debug(2, "[OTF] ctx is not ready\n");
 
        mfc_debug_leave();
 
@@ -482,7 +482,7 @@ int s5p_mfc_otf_handle_seq(struct s5p_mfc_ctx *ctx)
        s5p_mfc_change_state(ctx, MFCINST_HEAD_PARSED);
 
        if (s5p_mfc_alloc_codec_buffers(ctx)) {
-               mfc_err_ctx("[OTF] Failed to allocate encoding buffers.\n");
+               mfc_err_ctx("[OTF] Failed to allocate encoding buffers\n");
                return -EINVAL;
        }
 
@@ -626,7 +626,7 @@ void s5p_mfc_otf_handle_error(struct s5p_mfc_ctx *ctx,
 #endif
                break;
        default:
-               mfc_err_ctx("Encountered an error interrupt which had not been handled.\n");
+               mfc_err_ctx("Encountered an error interrupt which had not been handled\n");
                mfc_err_ctx("ctx->state = %d, ctx->inst_no = %d\n",
                                                ctx->state, ctx->inst_no);
                break;
index e75c483df92c5737898a1dee0374dff7533a0bb5..5c0dbbb9ba4085e59b978a54ba59ff90fa093a43 100644 (file)
@@ -846,7 +846,7 @@ struct s5p_mfc_buf *mfc_check_full_refered_dpb(struct s5p_mfc_ctx *ctx)
                        mfc_err_ctx("[DPB] dst_buf_queue is empty\n");
                        return NULL;
                }
-               mfc_debug(3, "[DPB] We should use this buffer.\n");
+               mfc_debug(3, "[DPB] We should use this buffer\n");
                mfc_buf = list_entry(ctx->dst_buf_queue.head.next,
                                struct s5p_mfc_buf, list);
        } else if ((ctx->dst_buf_queue.count == 0)
@@ -855,7 +855,7 @@ struct s5p_mfc_buf *mfc_check_full_refered_dpb(struct s5p_mfc_ctx *ctx)
                        mfc_err_ctx("[DPB] ref_buf_queue is empty\n");
                        return NULL;
                }
-               mfc_debug(3, "[DPB] All buffers are referenced.\n");
+               mfc_debug(3, "[DPB] All buffers are referenced\n");
                mfc_buf = list_entry(ctx->ref_buf_queue.head.next,
                                struct s5p_mfc_buf, list);
        } else {
index 762bfb8597c7b4111cb8ad146ec7b3852e2056d0..978f91c70da2d0375b7bc8fd9a836c14db2d8e2a 100644 (file)
@@ -55,7 +55,7 @@ int s5p_mfc_wait_for_done_dev(struct s5p_mfc_dev *dev, int command)
                        wait_condition(dev, command),
                        msecs_to_jiffies(MFC_INT_TIMEOUT));
        if (ret == 0) {
-               mfc_err_dev("Interrupt (dev->int_reason:%d, command:%d) timed out.\n",
+               mfc_err_dev("Interrupt (dev->int_reason:%d, command:%d) timed out\n",
                                                        dev->int_reason, command);
                if (s5p_mfc_check_risc2host(dev)) {
                        ret = wait_event_timeout(dev->cmd_wq,
@@ -73,7 +73,7 @@ int s5p_mfc_wait_for_done_dev(struct s5p_mfc_dev *dev, int command)
        }
 
 wait_done:
-       mfc_debug(2, "Finished waiting (dev->int_reason:%d, command: %d).\n",
+       mfc_debug(2, "Finished waiting (dev->int_reason:%d, command: %d)\n",
                                                        dev->int_reason, command);
        return 0;
 }
@@ -97,7 +97,7 @@ int s5p_mfc_wait_for_done_ctx(struct s5p_mfc_ctx *ctx, int command)
                        wait_condition(ctx, command),
                        msecs_to_jiffies(timeout));
        if (ret == 0) {
-               mfc_err_ctx("Interrupt (ctx->int_reason:%d, command:%d) timed out.\n",
+               mfc_err_ctx("Interrupt (ctx->int_reason:%d, command:%d) timed out\n",
                                                        ctx->int_reason, command);
                if (s5p_mfc_check_risc2host(dev)) {
                        ret = wait_event_timeout(ctx->cmd_wq,
@@ -116,14 +116,14 @@ int s5p_mfc_wait_for_done_ctx(struct s5p_mfc_ctx *ctx, int command)
 
 wait_done:
        if (is_err_cond(ctx)) {
-               mfc_err_ctx("Finished (ctx->int_reason:%d, command: %d).\n",
+               mfc_err_ctx("Finished (ctx->int_reason:%d, command: %d)\n",
                                ctx->int_reason, command);
-               mfc_err_ctx("But error (ctx->int_err:%d).\n", ctx->int_err);
+               mfc_err_ctx("But error (ctx->int_err:%d)\n", ctx->int_err);
                call_dop(dev, dump_and_stop_debug_mode, dev);
                return -1;
        }
 
-       mfc_debug(2, "Finished waiting (ctx->int_reason:%d, command: %d).\n",
+       mfc_debug(2, "Finished waiting (ctx->int_reason:%d, command: %d)\n",
                                                        ctx->int_reason, command);
        return 0;
 }
@@ -264,7 +264,7 @@ int s5p_mfc_dec_ctx_ready(struct s5p_mfc_ctx *ctx)
                return 1;
 
        s5p_mfc_perf_cancel_drv_margin(dev);
-       mfc_debug(2, "ctx is not ready.\n");
+       mfc_debug(2, "ctx is not ready\n");
 
        return 0;
 }
@@ -326,7 +326,7 @@ int s5p_mfc_enc_ctx_ready(struct s5p_mfc_ctx *ctx)
                return 1;
 
        s5p_mfc_perf_cancel_drv_margin(dev);
-       mfc_debug(2, "ctx is not ready.\n");
+       mfc_debug(2, "ctx is not ready\n");
 
        return 0;
 }