From: Ayoung Sim Date: Thu, 21 Jun 2018 23:57:34 +0000 (+0900) Subject: [COMMON] media: mfc: DRV4.0: remove the unnecessary mark X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ac21f858105c0dff069c5ceb38ad23f9989246dd;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git [COMMON] media: mfc: DRV4.0: remove the unnecessary mark Change-Id: I8b3416ff4056140e290a5aaf486b5049edce755c Signed-off-by: Ayoung Sim --- diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc.c b/drivers/media/platform/exynos/mfc/s5p_mfc.c index 205df0103489..61a9462f4539 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc.c +++ b/drivers/media/platform/exynos/mfc/s5p_mfc.c @@ -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); diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_buf.c b/drivers/media/platform/exynos/mfc/s5p_mfc_buf.c index 2d2b5f9be822..1d824c33a7e2 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_buf.c +++ b/drivers/media/platform/exynos/mfc/s5p_mfc_buf.c @@ -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; diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_cmd.c b/drivers/media/platform/exynos/mfc/s5p_mfc_cmd.c index 1c49db999f78..c744883cf3f1 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_cmd.c +++ b/drivers/media/platform/exynos/mfc/s5p_mfc_cmd.c @@ -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; } } diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_ctrl.c b/drivers/media/platform/exynos/mfc/s5p_mfc_ctrl.c index d6970405df75..0736d055cc2b 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_ctrl.c +++ b/drivers/media/platform/exynos/mfc/s5p_mfc_ctrl.c @@ -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; } diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_debugfs.c b/drivers/media/platform/exynos/mfc/s5p_mfc_debugfs.c index 37cdee1c2cc4..55e17ff0710d 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_debugfs.c +++ b/drivers/media/platform/exynos/mfc/s5p_mfc_debugfs.c @@ -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; } diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_dec.c b/drivers/media/platform/exynos/mfc/s5p_mfc_dec.c index a54647f23660..8ea96d3dc666 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_dec.c +++ b/drivers/media/platform/exynos/mfc/s5p_mfc_dec.c @@ -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) { diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_dec_vb2_ops.c b/drivers/media/platform/exynos/mfc/s5p_mfc_dec_vb2_ops.c index 962f53b130ef..50c1735f1d8a 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_dec_vb2_ops.c +++ b/drivers/media/platform/exynos/mfc/s5p_mfc_dec_vb2_ops.c @@ -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; diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_enc.c b/drivers/media/platform/exynos/mfc/s5p_mfc_enc.c index e57824612cc3..87e7983aab96 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_enc.c +++ b/drivers/media/platform/exynos/mfc/s5p_mfc_enc.c @@ -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) { diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_enc_vb2_ops.c b/drivers/media/platform/exynos/mfc/s5p_mfc_enc_vb2_ops.c index 6648d8a4e4b2..745e7ce7fdd0 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_enc_vb2_ops.c +++ b/drivers/media/platform/exynos/mfc/s5p_mfc_enc_vb2_ops.c @@ -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)) { diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_hwlock.c b/drivers/media/platform/exynos/mfc/s5p_mfc_hwlock.c index 91baf6b8a98a..e74c91ccaae8 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_hwlock.c +++ b/drivers/media/platform/exynos/mfc/s5p_mfc_hwlock.c @@ -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); } diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_inst.c b/drivers/media/platform/exynos/mfc/s5p_mfc_inst.c index 463b11b7423b..1e9c130a16db 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_inst.c +++ b/drivers/media/platform/exynos/mfc/s5p_mfc_inst.c @@ -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; } diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_irq.c b/drivers/media/platform/exynos/mfc/s5p_mfc_irq.c index 539377b22307..dba7417f2c5e 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_irq.c +++ b/drivers/media/platform/exynos/mfc/s5p_mfc_irq.c @@ -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; } diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_mmcache.c b/drivers/media/platform/exynos/mfc/s5p_mfc_mmcache.c index a5a07b7888d7..416bfbb83fda 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_mmcache.c +++ b/drivers/media/platform/exynos/mfc/s5p_mfc_mmcache.c @@ -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; } diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_nal_q.c b/drivers/media/platform/exynos/mfc/s5p_mfc_nal_q.c index 64c284cfb5b9..a4fd952aecfc 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_nal_q.c +++ b/drivers/media/platform/exynos/mfc/s5p_mfc_nal_q.c @@ -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); diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_opr.c b/drivers/media/platform/exynos/mfc/s5p_mfc_opr.c index f4cdc83c7b7f..31ed9ada52f9 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_opr.c +++ b/drivers/media/platform/exynos/mfc/s5p_mfc_opr.c @@ -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; } diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_otf.c b/drivers/media/platform/exynos/mfc/s5p_mfc_otf.c index 464ec70d013a..62ba98a6b22d 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_otf.c +++ b/drivers/media/platform/exynos/mfc/s5p_mfc_otf.c @@ -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; diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_queue.c b/drivers/media/platform/exynos/mfc/s5p_mfc_queue.c index e75c483df92c..5c0dbbb9ba40 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_queue.c +++ b/drivers/media/platform/exynos/mfc/s5p_mfc_queue.c @@ -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 { diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_sync.c b/drivers/media/platform/exynos/mfc/s5p_mfc_sync.c index 762bfb8597c7..978f91c70da2 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_sync.c +++ b/drivers/media/platform/exynos/mfc/s5p_mfc_sync.c @@ -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; }