From 2d823dcfdd66489d2b61a7a45a69e192ad89dc6e Mon Sep 17 00:00:00 2001 From: Sunyoung Kang Date: Tue, 26 Jun 2018 14:05:00 +0900 Subject: [PATCH] [COMMON] media: mfc: DRV4.0: remove "s5p" prefix in mfc hwfc The mfc hwfc has been modified like below. - header file rename: s5p_mfc_hwfc.h => mfc_hwfc.h - function rename: s5p_mfc_hwfc_encode => mfc_hwfc_encode Change-Id: I6b7b471e02c0dc5721748869ed95c1608db1e76e Signed-off-by: Sunyoung Kang --- drivers/media/platform/exynos/mfc/mfc_otf.c | 4 ++-- .../media/platform/exynos/repeater/repeater_dev.c | 8 ++++---- .../media/platform/exynos/repeater/repeater_dev.h | 2 +- include/media/{s5p_mfc_hwfc.h => mfc_hwfc.h} | 12 ++++++------ 4 files changed, 13 insertions(+), 13 deletions(-) rename include/media/{s5p_mfc_hwfc.h => mfc_hwfc.h} (74%) diff --git a/drivers/media/platform/exynos/mfc/mfc_otf.c b/drivers/media/platform/exynos/mfc/mfc_otf.c index c16c94c86f1a..aa95f5133a84 100644 --- a/drivers/media/platform/exynos/mfc/mfc_otf.c +++ b/drivers/media/platform/exynos/mfc/mfc_otf.c @@ -16,7 +16,7 @@ #ifdef CONFIG_VIDEO_EXYNOS_TSMUX #include #endif -#include +#include #include "mfc_otf.h" #include "mfc_hwfc_internal.h" @@ -661,7 +661,7 @@ int __mfc_hwfc_check_run(struct mfc_ctx *ctx) return 0; } -int s5p_mfc_hwfc_encode(int buf_index, int job_id, struct encoding_param *param) +int mfc_hwfc_encode(int buf_index, int job_id, struct encoding_param *param) { struct mfc_dev *dev = g_mfc_dev; struct _otf_handle *handle; diff --git a/drivers/media/platform/exynos/repeater/repeater_dev.c b/drivers/media/platform/exynos/repeater/repeater_dev.c index a36737cba322..192ef7ffa826 100644 --- a/drivers/media/platform/exynos/repeater/repeater_dev.c +++ b/drivers/media/platform/exynos/repeater/repeater_dev.c @@ -186,10 +186,10 @@ int hwfc_set_valid_buffer(int buf_idx, int capture_idx) if (ret == 0) { ctx->enc_param.time_stamp = cur_timestamp; set_encoding_start(shr_bufs, buf_idx); - ret = s5p_mfc_hwfc_encode(buf_idx, capture_idx, &ctx->enc_param); + ret = mfc_hwfc_encode(buf_idx, capture_idx, &ctx->enc_param); if (ret != HWFC_ERR_NONE) { print_repeater_debug(RPT_ERROR, - "s5p_mfc_hwfc_encode failed %d\n", ret); + "mfc_hwfc_encode failed %d\n", ret); ret = set_encoding_done(shr_bufs); } } @@ -322,10 +322,10 @@ void encoding_work_handler(struct work_struct *work) ctx->buf_idx_dump = buf_idx; wake_up_interruptible(&ctx->wait_queue_dump); set_encoding_start(shr_bufs, buf_idx); - ret = s5p_mfc_hwfc_encode(buf_idx, buf_idx, &ctx->enc_param); + ret = mfc_hwfc_encode(buf_idx, buf_idx, &ctx->enc_param); if (ret != HWFC_ERR_NONE) { print_repeater_debug(RPT_ERROR, - "s5p_mfc_hwfc_encode failed %d\n", ret); + "mfc_hwfc_encode failed %d\n", ret); ret = set_encoding_done(shr_bufs); } } diff --git a/drivers/media/platform/exynos/repeater/repeater_dev.h b/drivers/media/platform/exynos/repeater/repeater_dev.h index ffe96794d807..4b9644e83941 100644 --- a/drivers/media/platform/exynos/repeater/repeater_dev.h +++ b/drivers/media/platform/exynos/repeater/repeater_dev.h @@ -23,7 +23,7 @@ #include #include -#include +#include #include "repeater.h" #include "repeater_buf.h" diff --git a/include/media/s5p_mfc_hwfc.h b/include/media/mfc_hwfc.h similarity index 74% rename from include/media/s5p_mfc_hwfc.h rename to include/media/mfc_hwfc.h index 39b55853dc8c..142fb69b5946 100644 --- a/include/media/s5p_mfc_hwfc.h +++ b/include/media/mfc_hwfc.h @@ -10,8 +10,8 @@ * (at your option) any later version. */ -#ifndef _S5P_MFC_HWFC_H -#define _S5P_MFC_HWFC_H +#ifndef _MFC_HWFC_H +#define _MFC_HWFC_H #include @@ -31,19 +31,19 @@ struct encoding_param { }; /* - * s5p_mfc_hwfc_encode - Request encoding + * mfc_hwfc_encode - Request encoding * @encoding_param : parameters for encoding * * repeater calls it to start encoding * */ #ifdef CONFIG_VIDEO_EXYNOS_MFC -int s5p_mfc_hwfc_encode(int buf_index, int job_id, struct encoding_param *param); +int mfc_hwfc_encode(int buf_index, int job_id, struct encoding_param *param); #else -static inline int s5p_mfc_hwfc_encode(int buf_index, int job_id, struct encoding_param *param) +static inline int mfc_hwfc_encode(int buf_index, int job_id, struct encoding_param *param) { return -HWFC_ERR_MFC_NOT_ENABLED; } #endif -#endif /* _S5P_MFC_HWFC_H */ +#endif /* _MFC_HWFC_H */ -- 2.20.1