[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 <sy0816.kang@samsung.com>

diff --git a/drivers/media/platform/exynos/mfc/mfc_otf.c b/drivers/media/platform/exynos/mfc/mfc_otf.c
index c16c94c86f1a74c4236450407b18f8b02048418d..aa95f5133a84f2ad4bd92711665f9b9b02265239 100644 (file)
--- 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 <media/exynos_tsmux.h>
 #endif
-#include <media/s5p_mfc_hwfc.h>
+#include <media/mfc_hwfc.h>
 
 #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 a36737cba322a8c6759d5e954376efb55cbc00b5..192ef7ffa826b1cc1eda4476157447f535c975ff 100644 (file)
--- 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 ffe96794d807957cf70726050a91c3f34980770b..4b9644e839412f02bd0787e3cc4247db678595b9 100644 (file)
--- a/drivers/media/platform/exynos/repeater/repeater_dev.h
+++ b/drivers/media/platform/exynos/repeater/repeater_dev.h
@@ -23,7 +23,7 @@
 #include <linux/timer.h>
 
 #include <media/exynos_repeater.h>
-#include <media/s5p_mfc_hwfc.h>
+#include <media/mfc_hwfc.h>
 
 #include "repeater.h"
 #include "repeater_buf.h"

diff --git a/include/media/mfc_hwfc.h b/include/media/mfc_hwfc.h
new file mode 100644 (file)
index 0000000..142fb69
--- /dev/null
+++ b/include/media/mfc_hwfc.h
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ *             http://www.samsung.com
+ *
+ * Header file for mfc driver
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#ifndef _MFC_HWFC_H
+#define _MFC_HWFC_H
+
+#include <linux/types.h>
+
+#define HWFC_ERR_NONE                  0
+#define HWFC_ERR_TSMUX                 1
+#define HWFC_ERR_MFC                   2
+#define HWFC_ERR_MFC_NOT_PREPARED      3
+#define HWFC_ERR_MFC_TIMEOUT           4
+#define HWFC_ERR_MFC_NOT_ENABLED       5
+
+/*
+ * struct encoding_param
+ * @time_stamp : timestamp value
+ */
+struct encoding_param {
+       u64 time_stamp;
+};
+
+/*
+ * mfc_hwfc_encode - Request encoding
+ * @encoding_param : parameters for encoding
+ *
+ * repeater calls it to start encoding
+ *
+ */
+#ifdef CONFIG_VIDEO_EXYNOS_MFC
+int mfc_hwfc_encode(int buf_index, int job_id, struct encoding_param *param);
+#else
+static inline int mfc_hwfc_encode(int buf_index, int job_id, struct encoding_param *param)
+{
+       return -HWFC_ERR_MFC_NOT_ENABLED;
+}
+#endif
+
+#endif /* _MFC_HWFC_H */

diff --git a/include/media/s5p_mfc_hwfc.h b/include/media/s5p_mfc_hwfc.h
deleted file mode 100644 (file)
index 39b5585..0000000
--- a/include/media/s5p_mfc_hwfc.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
- *             http://www.samsung.com
- *
- * Header file for mfc driver
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-
-#ifndef _S5P_MFC_HWFC_H
-#define _S5P_MFC_HWFC_H
-
-#include <linux/types.h>
-
-#define HWFC_ERR_NONE                  0
-#define HWFC_ERR_TSMUX                 1
-#define HWFC_ERR_MFC                   2
-#define HWFC_ERR_MFC_NOT_PREPARED      3
-#define HWFC_ERR_MFC_TIMEOUT           4
-#define HWFC_ERR_MFC_NOT_ENABLED       5
-
-/*
- * struct encoding_param
- * @time_stamp : timestamp value
- */
-struct encoding_param {
-       u64 time_stamp;
-};
-
-/*
- * s5p_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);
-#else
-static inline int s5p_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 */