From e836d0aea46692d0ae66439eaddc7b37a51eec32 Mon Sep 17 00:00:00 2001 From: Sunyoung Kang Date: Mon, 25 Jun 2018 15:43:24 +0900 Subject: [PATCH] [COMMON] media: mfc: DRV4.0: remove "s5p" prefix in file name. The "s5p" prefix is no longer meaningful so this renames all files. Change-Id: I46662fd4660c66eeafd0322053292a61e9b3c3e1 Signed-off-by: Sunyoung Kang --- drivers/media/platform/exynos/mfc/Makefile | 16 +++--- .../platform/exynos/mfc/{s5p_mfc.c => mfc.c} | 54 +++++++++---------- .../exynos/mfc/{s5p_mfc_buf.c => mfc_buf.c} | 4 +- .../exynos/mfc/{s5p_mfc_buf.h => mfc_buf.h} | 8 +-- .../exynos/mfc/{s5p_mfc_cal.c => mfc_cal.c} | 4 +- .../exynos/mfc/{s5p_mfc_cal.h => mfc_cal.h} | 12 ++--- .../exynos/mfc/{s5p_mfc_cmd.c => mfc_cmd.c} | 12 ++--- .../exynos/mfc/{s5p_mfc_cmd.h => mfc_cmd.h} | 8 +-- .../mfc/{s5p_mfc_common.h => mfc_common.h} | 14 ++--- .../exynos/mfc/{s5p_mfc_ctrl.c => mfc_ctrl.c} | 18 +++---- .../exynos/mfc/{s5p_mfc_ctrl.h => mfc_ctrl.h} | 8 +-- ...5p_mfc_data_struct.h => mfc_data_struct.h} | 6 +-- .../mfc/{s5p_mfc_debug.h => mfc_debug.h} | 6 +-- .../mfc/{s5p_mfc_debugfs.c => mfc_debugfs.c} | 8 +-- .../mfc/{s5p_mfc_debugfs.h => mfc_debugfs.h} | 8 +-- .../exynos/mfc/{s5p_mfc_dec.c => mfc_dec.c} | 26 ++++----- .../exynos/mfc/{s5p_mfc_dec.h => mfc_dec.h} | 8 +-- ..._mfc_dec_internal.h => mfc_dec_internal.h} | 8 +-- .../mfc/{s5p_mfc_dec_ops.c => mfc_dec_ops.c} | 4 +- ...5p_mfc_dec_vb2_ops.c => mfc_dec_vb2_ops.c} | 18 +++---- .../exynos/mfc/{s5p_mfc_enc.c => mfc_enc.c} | 26 ++++----- .../exynos/mfc/{s5p_mfc_enc.h => mfc_enc.h} | 8 +-- ..._mfc_enc_internal.h => mfc_enc_internal.h} | 8 +-- .../mfc/{s5p_mfc_enc_ops.c => mfc_enc_ops.c} | 4 +- .../{s5p_mfc_enc_param.c => mfc_enc_param.c} | 4 +- .../{s5p_mfc_enc_param.h => mfc_enc_param.h} | 8 +-- ...5p_mfc_enc_vb2_ops.c => mfc_enc_vb2_ops.c} | 24 ++++----- ...fc_hwfc_internal.h => mfc_hwfc_internal.h} | 8 +-- .../mfc/{s5p_mfc_hwlock.c => mfc_hwlock.c} | 24 ++++----- .../mfc/{s5p_mfc_hwlock.h => mfc_hwlock.h} | 8 +-- .../exynos/mfc/{s5p_mfc_inst.c => mfc_inst.c} | 14 ++--- .../exynos/mfc/{s5p_mfc_inst.h => mfc_inst.h} | 8 +-- .../exynos/mfc/{s5p_mfc_irq.c => mfc_irq.c} | 36 ++++++------- .../exynos/mfc/{s5p_mfc_irq.h => mfc_irq.h} | 10 ++-- .../mfc/{s5p_mfc_macros.h => mfc_macros.h} | 6 +-- .../exynos/mfc/{s5p_mfc_mem.c => mfc_mem.c} | 2 +- .../exynos/mfc/{s5p_mfc_mem.h => mfc_mem.h} | 8 +-- .../mfc/{s5p_mfc_mmcache.c => mfc_mmcache.c} | 4 +- .../mfc/{s5p_mfc_mmcache.h => mfc_mmcache.h} | 8 +-- .../mfc/{s5p_mfc_nal_q.c => mfc_nal_q.c} | 20 +++---- .../mfc/{s5p_mfc_nal_q.h => mfc_nal_q.h} | 8 +-- .../exynos/mfc/{s5p_mfc_opr.c => mfc_opr.c} | 12 ++--- .../exynos/mfc/{s5p_mfc_opr.h => mfc_opr.h} | 8 +-- .../exynos/mfc/{s5p_mfc_otf.c => mfc_otf.c} | 24 ++++----- .../exynos/mfc/{s5p_mfc_otf.h => mfc_otf.h} | 8 +-- ..._mfc_perf_measure.c => mfc_perf_measure.c} | 2 +- ..._mfc_perf_measure.h => mfc_perf_measure.h} | 8 +-- .../exynos/mfc/{s5p_mfc_pm.c => mfc_pm.c} | 6 +-- .../exynos/mfc/{s5p_mfc_pm.h => mfc_pm.h} | 8 +-- .../exynos/mfc/{s5p_mfc_qos.c => mfc_qos.c} | 2 +- .../exynos/mfc/{s5p_mfc_qos.h => mfc_qos.h} | 8 +-- .../mfc/{s5p_mfc_queue.c => mfc_queue.c} | 6 +-- .../mfc/{s5p_mfc_queue.h => mfc_queue.h} | 8 +-- .../exynos/mfc/{s5p_mfc_reg.c => mfc_reg.c} | 2 +- .../exynos/mfc/{s5p_mfc_reg.h => mfc_reg.h} | 10 ++-- .../{s5p_mfc_regs_v10.h => mfc_regs_v10.h} | 0 .../exynos/mfc/{s5p_mfc_sync.c => mfc_sync.c} | 8 +-- .../exynos/mfc/{s5p_mfc_sync.h => mfc_sync.h} | 8 +-- .../mfc/{s5p_mfc_utils.c => mfc_utils.c} | 2 +- .../mfc/{s5p_mfc_utils.h => mfc_utils.h} | 8 +-- .../{s5p_mfc_watchdog.c => mfc_watchdog.c} | 16 +++--- .../{s5p_mfc_watchdog.h => mfc_watchdog.h} | 8 +-- 62 files changed, 329 insertions(+), 329 deletions(-) rename drivers/media/platform/exynos/mfc/{s5p_mfc.c => mfc.c} (98%) rename drivers/media/platform/exynos/mfc/{s5p_mfc_buf.c => mfc_buf.c} (99%) rename drivers/media/platform/exynos/mfc/{s5p_mfc_buf.h => mfc_buf.h} (92%) rename drivers/media/platform/exynos/mfc/{s5p_mfc_cal.c => mfc_cal.c} (98%) rename drivers/media/platform/exynos/mfc/{s5p_mfc_cal.h => mfc_cal.h} (94%) rename drivers/media/platform/exynos/mfc/{s5p_mfc_cmd.c => mfc_cmd.c} (97%) rename drivers/media/platform/exynos/mfc/{s5p_mfc_cmd.h => mfc_cmd.h} (88%) rename drivers/media/platform/exynos/mfc/{s5p_mfc_common.h => mfc_common.h} (96%) rename drivers/media/platform/exynos/mfc/{s5p_mfc_ctrl.c => mfc_ctrl.c} (97%) rename drivers/media/platform/exynos/mfc/{s5p_mfc_ctrl.h => mfc_ctrl.h} (83%) rename drivers/media/platform/exynos/mfc/{s5p_mfc_data_struct.h => mfc_data_struct.h} (99%) rename drivers/media/platform/exynos/mfc/{s5p_mfc_debug.h => mfc_debug.h} (97%) rename drivers/media/platform/exynos/mfc/{s5p_mfc_debugfs.c => mfc_debugfs.c} (98%) rename drivers/media/platform/exynos/mfc/{s5p_mfc_debugfs.h => mfc_debugfs.h} (78%) rename drivers/media/platform/exynos/mfc/{s5p_mfc_dec.c => mfc_dec.c} (99%) rename drivers/media/platform/exynos/mfc/{s5p_mfc_dec.h => mfc_dec.h} (80%) rename drivers/media/platform/exynos/mfc/{s5p_mfc_dec_internal.h => mfc_dec_internal.h} (98%) rename drivers/media/platform/exynos/mfc/{s5p_mfc_dec_ops.c => mfc_dec_ops.c} (99%) rename drivers/media/platform/exynos/mfc/{s5p_mfc_dec_vb2_ops.c => mfc_dec_vb2_ops.c} (98%) rename drivers/media/platform/exynos/mfc/{s5p_mfc_enc.c => mfc_enc.c} (99%) rename drivers/media/platform/exynos/mfc/{s5p_mfc_enc.h => mfc_enc.h} (80%) rename drivers/media/platform/exynos/mfc/{s5p_mfc_enc_internal.h => mfc_enc_internal.h} (99%) rename drivers/media/platform/exynos/mfc/{s5p_mfc_enc_ops.c => mfc_enc_ops.c} (99%) rename drivers/media/platform/exynos/mfc/{s5p_mfc_enc_param.c => mfc_enc_param.c} (99%) rename drivers/media/platform/exynos/mfc/{s5p_mfc_enc_param.h => mfc_enc_param.h} (86%) rename drivers/media/platform/exynos/mfc/{s5p_mfc_enc_vb2_ops.c => mfc_enc_vb2_ops.c} (98%) rename drivers/media/platform/exynos/mfc/{s5p_mfc_hwfc_internal.h => mfc_hwfc_internal.h} (89%) rename drivers/media/platform/exynos/mfc/{s5p_mfc_hwlock.c => mfc_hwlock.c} (98%) rename drivers/media/platform/exynos/mfc/{s5p_mfc_hwlock.h => mfc_hwlock.h} (94%) rename drivers/media/platform/exynos/mfc/{s5p_mfc_inst.c => mfc_inst.c} (97%) rename drivers/media/platform/exynos/mfc/{s5p_mfc_inst.h => mfc_inst.h} (87%) rename drivers/media/platform/exynos/mfc/{s5p_mfc_irq.c => mfc_irq.c} (99%) rename drivers/media/platform/exynos/mfc/{s5p_mfc_irq.h => mfc_irq.h} (84%) rename drivers/media/platform/exynos/mfc/{s5p_mfc_macros.h => mfc_macros.h} (96%) rename drivers/media/platform/exynos/mfc/{s5p_mfc_mem.c => mfc_mem.c} (99%) rename drivers/media/platform/exynos/mfc/{s5p_mfc_mem.h => mfc_mem.h} (94%) rename drivers/media/platform/exynos/mfc/{s5p_mfc_mmcache.c => mfc_mmcache.c} (99%) rename drivers/media/platform/exynos/mfc/{s5p_mfc_mmcache.h => mfc_mmcache.h} (89%) rename drivers/media/platform/exynos/mfc/{s5p_mfc_nal_q.c => mfc_nal_q.c} (99%) rename drivers/media/platform/exynos/mfc/{s5p_mfc_nal_q.h => mfc_nal_q.h} (92%) rename drivers/media/platform/exynos/mfc/{s5p_mfc_opr.c => mfc_opr.c} (98%) rename drivers/media/platform/exynos/mfc/{s5p_mfc_opr.h => mfc_opr.h} (86%) rename drivers/media/platform/exynos/mfc/{s5p_mfc_otf.c => mfc_otf.c} (98%) rename drivers/media/platform/exynos/mfc/{s5p_mfc_otf.h => mfc_otf.h} (89%) rename drivers/media/platform/exynos/mfc/{s5p_mfc_perf_measure.c => mfc_perf_measure.c} (95%) rename drivers/media/platform/exynos/mfc/{s5p_mfc_perf_measure.h => mfc_perf_measure.h} (94%) rename drivers/media/platform/exynos/mfc/{s5p_mfc_pm.c => mfc_pm.c} (98%) rename drivers/media/platform/exynos/mfc/{s5p_mfc_pm.h => mfc_pm.h} (90%) rename drivers/media/platform/exynos/mfc/{s5p_mfc_qos.c => mfc_qos.c} (99%) rename drivers/media/platform/exynos/mfc/{s5p_mfc_qos.h => mfc_qos.h} (94%) rename drivers/media/platform/exynos/mfc/{s5p_mfc_queue.c => mfc_queue.c} (99%) rename drivers/media/platform/exynos/mfc/{s5p_mfc_queue.h => mfc_queue.h} (97%) rename drivers/media/platform/exynos/mfc/{s5p_mfc_reg.c => mfc_reg.c} (99%) rename drivers/media/platform/exynos/mfc/{s5p_mfc_reg.h => mfc_reg.h} (98%) rename drivers/media/platform/exynos/mfc/{s5p_mfc_regs_v10.h => mfc_regs_v10.h} (100%) rename drivers/media/platform/exynos/mfc/{s5p_mfc_sync.c => mfc_sync.c} (98%) rename drivers/media/platform/exynos/mfc/{s5p_mfc_sync.h => mfc_sync.h} (96%) rename drivers/media/platform/exynos/mfc/{s5p_mfc_utils.c => mfc_utils.c} (99%) rename drivers/media/platform/exynos/mfc/{s5p_mfc_utils.h => mfc_utils.h} (97%) rename drivers/media/platform/exynos/mfc/{s5p_mfc_watchdog.c => mfc_watchdog.c} (98%) rename drivers/media/platform/exynos/mfc/{s5p_mfc_watchdog.h => mfc_watchdog.h} (78%) diff --git a/drivers/media/platform/exynos/mfc/Makefile b/drivers/media/platform/exynos/mfc/Makefile index 428674d17dd1..72eddaeb1112 100644 --- a/drivers/media/platform/exynos/mfc/Makefile +++ b/drivers/media/platform/exynos/mfc/Makefile @@ -1,8 +1,8 @@ -obj-$(CONFIG_VIDEO_EXYNOS_MFC) := s5p-mfc.o -s5p-mfc-y += s5p_mfc.o s5p_mfc_irq.o s5p_mfc_dec.o s5p_mfc_dec_vb2_ops.o s5p_mfc_enc.o s5p_mfc_enc_vb2_ops.o -s5p-mfc-y += s5p_mfc_ctrl.o s5p_mfc_hwlock.o s5p_mfc_nal_q.o s5p_mfc_watchdog.o s5p_mfc_opr.o s5p_mfc_sync.o -s5p-mfc-y += s5p_mfc_pm.o s5p_mfc_inst.o s5p_mfc_cmd.o s5p_mfc_cal.o s5p_mfc_reg.o s5p_mfc_perf_measure.o -s5p-mfc-y += s5p_mfc_dec_ops.o s5p_mfc_enc_ops.o s5p_mfc_enc_param.o -s5p-mfc-y += s5p_mfc_queue.o s5p_mfc_buf.o s5p_mfc_utils.o s5p_mfc_qos.o s5p_mfc_mem.o -s5p-mfc-y += s5p_mfc_debugfs.o s5p_mfc_otf.o -s5p-mfc-y += s5p_mfc_mmcache.o +obj-$(CONFIG_VIDEO_EXYNOS_MFC) := exynos_mfc.o +exynos_mfc-y += mfc.o mfc_irq.o mfc_dec.o mfc_dec_vb2_ops.o mfc_enc.o mfc_enc_vb2_ops.o +exynos_mfc-y += mfc_ctrl.o mfc_hwlock.o mfc_nal_q.o mfc_watchdog.o mfc_opr.o mfc_sync.o +exynos_mfc-y += mfc_pm.o mfc_inst.o mfc_cmd.o mfc_cal.o mfc_reg.o mfc_perf_measure.o +exynos_mfc-y += mfc_dec_ops.o mfc_enc_ops.o mfc_enc_param.o +exynos_mfc-y += mfc_queue.o mfc_buf.o mfc_utils.o mfc_qos.o mfc_mem.o +exynos_mfc-y += mfc_debugfs.o mfc_otf.o +exynos_mfc-y += mfc_mmcache.o diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc.c b/drivers/media/platform/exynos/mfc/mfc.c similarity index 98% rename from drivers/media/platform/exynos/mfc/s5p_mfc.c rename to drivers/media/platform/exynos/mfc/mfc.c index 61a9462f4539..7d1adfbf3c87 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc.c +++ b/drivers/media/platform/exynos/mfc/mfc.c @@ -21,33 +21,33 @@ #include #include -#include "s5p_mfc_common.h" - -#include "s5p_mfc_irq.h" -#include "s5p_mfc_dec.h" -#include "s5p_mfc_enc.h" - -#include "s5p_mfc_ctrl.h" -#include "s5p_mfc_hwlock.h" -#include "s5p_mfc_nal_q.h" -#include "s5p_mfc_otf.h" -#include "s5p_mfc_watchdog.h" -#include "s5p_mfc_debugfs.h" -#include "s5p_mfc_opr.h" -#include "s5p_mfc_sync.h" - -#include "s5p_mfc_inst.h" -#include "s5p_mfc_pm.h" -#include "s5p_mfc_cal.h" -#include "s5p_mfc_perf_measure.h" -#include "s5p_mfc_reg.h" -#include "s5p_mfc_mmcache.h" - -#include "s5p_mfc_qos.h" -#include "s5p_mfc_queue.h" -#include "s5p_mfc_utils.h" -#include "s5p_mfc_buf.h" -#include "s5p_mfc_mem.h" +#include "mfc_common.h" + +#include "mfc_irq.h" +#include "mfc_dec.h" +#include "mfc_enc.h" + +#include "mfc_ctrl.h" +#include "mfc_hwlock.h" +#include "mfc_nal_q.h" +#include "mfc_otf.h" +#include "mfc_watchdog.h" +#include "mfc_debugfs.h" +#include "mfc_opr.h" +#include "mfc_sync.h" + +#include "mfc_inst.h" +#include "mfc_pm.h" +#include "mfc_cal.h" +#include "mfc_perf_measure.h" +#include "mfc_reg.h" +#include "mfc_mmcache.h" + +#include "mfc_qos.h" +#include "mfc_queue.h" +#include "mfc_utils.h" +#include "mfc_buf.h" +#include "mfc_mem.h" #define CREATE_TRACE_POINTS #include diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_buf.c b/drivers/media/platform/exynos/mfc/mfc_buf.c similarity index 99% rename from drivers/media/platform/exynos/mfc/s5p_mfc_buf.c rename to drivers/media/platform/exynos/mfc/mfc_buf.c index 1d824c33a7e2..d93489f2afe2 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_buf.c +++ b/drivers/media/platform/exynos/mfc/mfc_buf.c @@ -14,9 +14,9 @@ #include #include -#include "s5p_mfc_buf.h" +#include "mfc_buf.h" -#include "s5p_mfc_mem.h" +#include "mfc_mem.h" static int mfc_alloc_common_context(struct s5p_mfc_dev *dev, enum mfc_buf_usage_type buf_type) diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_buf.h b/drivers/media/platform/exynos/mfc/mfc_buf.h similarity index 92% rename from drivers/media/platform/exynos/mfc/s5p_mfc_buf.h rename to drivers/media/platform/exynos/mfc/mfc_buf.h index 6ffcc96a4fa7..ef5892320e89 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_buf.h +++ b/drivers/media/platform/exynos/mfc/mfc_buf.h @@ -10,10 +10,10 @@ * (at your option) any later version. */ -#ifndef __S5P_MFC_BUF_H -#define __S5P_MFC_BUF_H __FILE__ +#ifndef __MFC_BUF_H +#define __MFC_BUF_H __FILE__ -#include "s5p_mfc_common.h" +#include "mfc_common.h" /* Memory allocation */ int s5p_mfc_alloc_common_context(struct s5p_mfc_dev *dev); @@ -38,4 +38,4 @@ int s5p_mfc_release_firmware(struct s5p_mfc_dev *dev); int s5p_mfc_alloc_dbg_info_buffer(struct s5p_mfc_dev *dev); int s5p_mfc_release_dbg_info_buffer(struct s5p_mfc_dev *dev); -#endif /* __S5P_MFC_BUF_H */ +#endif /* __MFC_BUF_H */ diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_cal.c b/drivers/media/platform/exynos/mfc/mfc_cal.c similarity index 98% rename from drivers/media/platform/exynos/mfc/s5p_mfc_cal.c rename to drivers/media/platform/exynos/mfc/mfc_cal.c index c8d5cab8ab9b..78a2af0d38f3 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_cal.c +++ b/drivers/media/platform/exynos/mfc/mfc_cal.c @@ -12,8 +12,8 @@ #include -#include "s5p_mfc_cal.h" -#include "s5p_mfc_pm.h" +#include "mfc_cal.h" +#include "mfc_pm.h" /* Reset the device */ int s5p_mfc_reset_mfc(struct s5p_mfc_dev *dev) diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_cal.h b/drivers/media/platform/exynos/mfc/mfc_cal.h similarity index 94% rename from drivers/media/platform/exynos/mfc/s5p_mfc_cal.h rename to drivers/media/platform/exynos/mfc/mfc_cal.h index f2a965f436d9..7ea31cb8cfec 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_cal.h +++ b/drivers/media/platform/exynos/mfc/mfc_cal.h @@ -10,14 +10,14 @@ * (at your option) any later version. */ -#ifndef __S5P_MFC_CAL_H -#define __S5P_MFC_CAL_H __FILE__ +#ifndef __MFC_CAL_H +#define __MFC_CAL_H __FILE__ -#include "s5p_mfc_reg.h" +#include "mfc_reg.h" -#include "s5p_mfc_common.h" +#include "mfc_common.h" -#include "s5p_mfc_utils.h" +#include "mfc_utils.h" #define s5p_mfc_get_int_reason() (MFC_READL(S5P_FIMV_RISC2HOST_CMD) \ @@ -109,4 +109,4 @@ void s5p_mfc_set_risc_base_addr(struct s5p_mfc_dev *dev, void s5p_mfc_cmd_host2risc(struct s5p_mfc_dev *dev, int cmd); int s5p_mfc_check_risc2host(struct s5p_mfc_dev *dev); -#endif /* __S5P_MFC_CAL_H */ +#endif /* __MFC_CAL_H */ diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_cmd.c b/drivers/media/platform/exynos/mfc/mfc_cmd.c similarity index 97% rename from drivers/media/platform/exynos/mfc/s5p_mfc_cmd.c rename to drivers/media/platform/exynos/mfc/mfc_cmd.c index c744883cf3f1..d0477cd84bdf 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_cmd.c +++ b/drivers/media/platform/exynos/mfc/mfc_cmd.c @@ -12,14 +12,14 @@ #include -#include "s5p_mfc_cmd.h" +#include "mfc_cmd.h" -#include "s5p_mfc_cal.h" -#include "s5p_mfc_reg.h" -#include "s5p_mfc_mmcache.h" +#include "mfc_cal.h" +#include "mfc_reg.h" +#include "mfc_mmcache.h" -#include "s5p_mfc_utils.h" -#include "s5p_mfc_buf.h" +#include "mfc_utils.h" +#include "mfc_buf.h" int s5p_mfc_cmd_sys_init(struct s5p_mfc_dev *dev, enum mfc_buf_usage_type buf_type) diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_cmd.h b/drivers/media/platform/exynos/mfc/mfc_cmd.h similarity index 88% rename from drivers/media/platform/exynos/mfc/s5p_mfc_cmd.h rename to drivers/media/platform/exynos/mfc/mfc_cmd.h index 04554468bb3f..ebbd9705191c 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_cmd.h +++ b/drivers/media/platform/exynos/mfc/mfc_cmd.h @@ -10,10 +10,10 @@ * (at your option) any later version. */ -#ifndef __S5P_MFC_CMD_H -#define __S5P_MFC_CMD_H __FILE__ +#ifndef __MFC_CMD_H +#define __MFC_CMD_H __FILE__ -#include "s5p_mfc_common.h" +#include "mfc_common.h" int s5p_mfc_cmd_sys_init(struct s5p_mfc_dev *dev, enum mfc_buf_usage_type buf_type); @@ -26,4 +26,4 @@ int s5p_mfc_cmd_cache_flush(struct s5p_mfc_dev *dev); int s5p_mfc_cmd_dec_init_buffers(struct s5p_mfc_ctx *ctx); int s5p_mfc_cmd_enc_init_buffers(struct s5p_mfc_ctx *ctx); -#endif /* __S5P_MFC_CMD_H */ +#endif /* __MFC_CMD_H */ diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_common.h b/drivers/media/platform/exynos/mfc/mfc_common.h similarity index 96% rename from drivers/media/platform/exynos/mfc/s5p_mfc_common.h rename to drivers/media/platform/exynos/mfc/mfc_common.h index 0a919066cb18..37e99fedf840 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_common.h +++ b/drivers/media/platform/exynos/mfc/mfc_common.h @@ -10,8 +10,8 @@ * (at your option) any later version. */ -#ifndef __S5P_MFC_COMMON_H -#define __S5P_MFC_COMMON_H __FILE__ +#ifndef __MFC_COMMON_H +#define __MFC_COMMON_H __FILE__ #include #include @@ -22,11 +22,11 @@ #include #include -#include "s5p_mfc_regs_v10.h" -#include "s5p_mfc_macros.h" -#include "s5p_mfc_debug.h" +#include "mfc_regs_v10.h" +#include "mfc_macros.h" +#include "mfc_debug.h" #include "exynos_mfc_media.h" -#include "s5p_mfc_data_struct.h" +#include "mfc_data_struct.h" #define MFC_DRIVER_INFO 180315 @@ -189,4 +189,4 @@ #define IS_LOW_MEM (totalram_pages <= ((SZ_1G + SZ_512M) >> PAGE_SHIFT)) #define SZ_600M (6 * 1024 * 1024) -#endif /* __S5P_MFC_COMMON_H */ +#endif /* __MFC_COMMON_H */ diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_ctrl.c b/drivers/media/platform/exynos/mfc/mfc_ctrl.c similarity index 97% rename from drivers/media/platform/exynos/mfc/s5p_mfc_ctrl.c rename to drivers/media/platform/exynos/mfc/mfc_ctrl.c index 0736d055cc2b..10c2a324bebe 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_ctrl.c +++ b/drivers/media/platform/exynos/mfc/mfc_ctrl.c @@ -10,18 +10,18 @@ * (at your option) any later version. */ -#include "s5p_mfc_ctrl.h" +#include "mfc_ctrl.h" -#include "s5p_mfc_hwlock.h" -#include "s5p_mfc_nal_q.h" -#include "s5p_mfc_sync.h" +#include "mfc_hwlock.h" +#include "mfc_nal_q.h" +#include "mfc_sync.h" -#include "s5p_mfc_pm.h" -#include "s5p_mfc_cmd.h" -#include "s5p_mfc_cal.h" -#include "s5p_mfc_reg.h" +#include "mfc_pm.h" +#include "mfc_cmd.h" +#include "mfc_cal.h" +#include "mfc_reg.h" -#include "s5p_mfc_utils.h" +#include "mfc_utils.h" /* Initialize hardware */ static int mfc_init_hw(struct s5p_mfc_dev *dev, enum mfc_buf_usage_type buf_type) diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_ctrl.h b/drivers/media/platform/exynos/mfc/mfc_ctrl.h similarity index 83% rename from drivers/media/platform/exynos/mfc/s5p_mfc_ctrl.h rename to drivers/media/platform/exynos/mfc/mfc_ctrl.h index 600083f168b6..4e98e2e61356 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_ctrl.h +++ b/drivers/media/platform/exynos/mfc/mfc_ctrl.h @@ -10,10 +10,10 @@ * (at your option) any later version. */ -#ifndef __S5P_MFC_CTRL_H -#define __S5P_MFC_CTRL_H __FILE__ +#ifndef __MFC_CTRL_H +#define __MFC_CTRL_H __FILE__ -#include "s5p_mfc_common.h" +#include "mfc_common.h" int s5p_mfc_init_hw(struct s5p_mfc_dev *dev); void s5p_mfc_deinit_hw(struct s5p_mfc_dev *dev); @@ -21,4 +21,4 @@ void s5p_mfc_deinit_hw(struct s5p_mfc_dev *dev); int s5p_mfc_sleep(struct s5p_mfc_dev *dev); int s5p_mfc_wakeup(struct s5p_mfc_dev *dev); -#endif /* __S5P_MFC_CTRL_H */ +#endif /* __MFC_CTRL_H */ diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_data_struct.h b/drivers/media/platform/exynos/mfc/mfc_data_struct.h similarity index 99% rename from drivers/media/platform/exynos/mfc/s5p_mfc_data_struct.h rename to drivers/media/platform/exynos/mfc/mfc_data_struct.h index be5790f037b1..d7e15b729150 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_data_struct.h +++ b/drivers/media/platform/exynos/mfc/mfc_data_struct.h @@ -10,8 +10,8 @@ * (at your option) any later version. */ -#ifndef __S5P_MFC_DATA_STRUCT_H -#define __S5P_MFC_DATA_STRUCT_H __FILE__ +#ifndef __MFC_DATA_STRUCT_H +#define __MFC_DATA_STRUCT_H __FILE__ #ifdef CONFIG_ARM_EXYNOS_DEVFREQ #define CONFIG_MFC_USE_BUS_DEVFREQ @@ -1405,4 +1405,4 @@ struct s5p_mfc_ctx { bool check_dump; }; -#endif /* __S5P_MFC_DATA_STRUCT_H */ +#endif /* __MFC_DATA_STRUCT_H */ diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_debug.h b/drivers/media/platform/exynos/mfc/mfc_debug.h similarity index 97% rename from drivers/media/platform/exynos/mfc/s5p_mfc_debug.h rename to drivers/media/platform/exynos/mfc/mfc_debug.h index f6bd7f1e2e18..0f219b2fb305 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_debug.h +++ b/drivers/media/platform/exynos/mfc/mfc_debug.h @@ -10,8 +10,8 @@ * (at your option) any later version. */ -#ifndef __S5P_MFC_DEBUG_H -#define __S5P_MFC_DEBUG_H __FILE__ +#ifndef __MFC_DEBUG_H +#define __MFC_DEBUG_H __FILE__ #define DEBUG @@ -123,4 +123,4 @@ struct _mfc_trace { } while (0) -#endif /* __S5P_MFC_DEBUG_H */ +#endif /* __MFC_DEBUG_H */ diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_debugfs.c b/drivers/media/platform/exynos/mfc/mfc_debugfs.c similarity index 98% rename from drivers/media/platform/exynos/mfc/s5p_mfc_debugfs.c rename to drivers/media/platform/exynos/mfc/mfc_debugfs.c index 61f80a6bd5c8..f8b6092b0783 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_debugfs.c +++ b/drivers/media/platform/exynos/mfc/mfc_debugfs.c @@ -13,12 +13,12 @@ #include #include -#include "s5p_mfc_debugfs.h" -#include "s5p_mfc_sync.h" +#include "mfc_debugfs.h" +#include "mfc_sync.h" -#include "s5p_mfc_pm.h" +#include "mfc_pm.h" -#include "s5p_mfc_queue.h" +#include "mfc_queue.h" unsigned int debug_level; unsigned int debug_ts; diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_debugfs.h b/drivers/media/platform/exynos/mfc/mfc_debugfs.h similarity index 78% rename from drivers/media/platform/exynos/mfc/s5p_mfc_debugfs.h rename to drivers/media/platform/exynos/mfc/mfc_debugfs.h index a4186e9eb972..36456deb6638 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_debugfs.h +++ b/drivers/media/platform/exynos/mfc/mfc_debugfs.h @@ -10,11 +10,11 @@ * (at your option) any later version. */ -#ifndef __S5P_MFC_DEBUGFS_H -#define __S5P_MFC_DEBUGFS_H __FILE__ +#ifndef __MFC_DEBUGFS_H +#define __MFC_DEBUGFS_H __FILE__ -#include "s5p_mfc_common.h" +#include "mfc_common.h" void s5p_mfc_init_debugfs(struct s5p_mfc_dev *dev); -#endif /* __S5P_MFC_DEBUGFS_H */ +#endif /* __MFC_DEBUGFS_H */ diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_dec.c b/drivers/media/platform/exynos/mfc/mfc_dec.c similarity index 99% rename from drivers/media/platform/exynos/mfc/s5p_mfc_dec.c rename to drivers/media/platform/exynos/mfc/mfc_dec.c index a28c70faff01..d6e2a886fa2d 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_dec.c +++ b/drivers/media/platform/exynos/mfc/mfc_dec.c @@ -10,19 +10,19 @@ * (at your option) any later version. */ -#include "s5p_mfc_dec.h" -#include "s5p_mfc_dec_internal.h" - -#include "s5p_mfc_hwlock.h" -#include "s5p_mfc_opr.h" -#include "s5p_mfc_sync.h" -#include "s5p_mfc_mmcache.h" - -#include "s5p_mfc_qos.h" -#include "s5p_mfc_queue.h" -#include "s5p_mfc_utils.h" -#include "s5p_mfc_buf.h" -#include "s5p_mfc_mem.h" +#include "mfc_dec.h" +#include "mfc_dec_internal.h" + +#include "mfc_hwlock.h" +#include "mfc_opr.h" +#include "mfc_sync.h" +#include "mfc_mmcache.h" + +#include "mfc_qos.h" +#include "mfc_queue.h" +#include "mfc_utils.h" +#include "mfc_buf.h" +#include "mfc_mem.h" #define MAX_FRAME_SIZE (2*1024*1024) diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_dec.h b/drivers/media/platform/exynos/mfc/mfc_dec.h similarity index 80% rename from drivers/media/platform/exynos/mfc/s5p_mfc_dec.h rename to drivers/media/platform/exynos/mfc/mfc_dec.h index 24e48f7de0a4..c5871ac76470 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_dec.h +++ b/drivers/media/platform/exynos/mfc/mfc_dec.h @@ -10,11 +10,11 @@ * (at your option) any later version. */ -#ifndef __S5P_MFC_DEC_H -#define __S5P_MFC_DEC_H __FILE__ +#ifndef __MFC_DEC_H +#define __MFC_DEC_H __FILE__ -#include "s5p_mfc_common.h" +#include "mfc_common.h" const struct v4l2_ioctl_ops *s5p_mfc_get_dec_v4l2_ioctl_ops(void); -#endif /* __S5P_MFC_DEC_H */ +#endif /* __MFC_DEC_H */ diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_dec_internal.h b/drivers/media/platform/exynos/mfc/mfc_dec_internal.h similarity index 98% rename from drivers/media/platform/exynos/mfc/s5p_mfc_dec_internal.h rename to drivers/media/platform/exynos/mfc/mfc_dec_internal.h index 07e88c58341b..81c8eedc27bf 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_dec_internal.h +++ b/drivers/media/platform/exynos/mfc/mfc_dec_internal.h @@ -10,10 +10,10 @@ * (at your option) any later version. */ -#ifndef __S5P_MFC_DEC_INTERNAL_H -#define __S5P_MFC_DEC_INTERNAL_H __FILE__ +#ifndef __MFC_DEC_INTERNAL_H +#define __MFC_DEC_INTERNAL_H __FILE__ -#include "s5p_mfc_common.h" +#include "mfc_common.h" struct s5p_mfc_fmt dec_formats[] = { { @@ -539,4 +539,4 @@ static struct v4l2_queryctrl controls[] = { #define NUM_CTRLS ARRAY_SIZE(controls) -#endif /* __S5P_MFC_DEC_INTERNAL_H */ +#endif /* __MFC_DEC_INTERNAL_H */ diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_dec_ops.c b/drivers/media/platform/exynos/mfc/mfc_dec_ops.c similarity index 99% rename from drivers/media/platform/exynos/mfc/s5p_mfc_dec_ops.c rename to drivers/media/platform/exynos/mfc/mfc_dec_ops.c index 89ffb16dce5c..1cbd273daf87 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_dec_ops.c +++ b/drivers/media/platform/exynos/mfc/mfc_dec_ops.c @@ -10,9 +10,9 @@ * (at your option) any later version. */ -#include "s5p_mfc_common.h" +#include "mfc_common.h" -#include "s5p_mfc_reg.h" +#include "mfc_reg.h" #define NUM_CTRL_CFGS ARRAY_SIZE(mfc_ctrl_list) diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_dec_vb2_ops.c b/drivers/media/platform/exynos/mfc/mfc_dec_vb2_ops.c similarity index 98% rename from drivers/media/platform/exynos/mfc/s5p_mfc_dec_vb2_ops.c rename to drivers/media/platform/exynos/mfc/mfc_dec_vb2_ops.c index 50c1735f1d8a..dbe739f85354 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_dec_vb2_ops.c +++ b/drivers/media/platform/exynos/mfc/mfc_dec_vb2_ops.c @@ -10,17 +10,17 @@ * (at your option) any later version. */ -#include "s5p_mfc_common.h" +#include "mfc_common.h" -#include "s5p_mfc_hwlock.h" -#include "s5p_mfc_nal_q.h" -#include "s5p_mfc_opr.h" -#include "s5p_mfc_sync.h" +#include "mfc_hwlock.h" +#include "mfc_nal_q.h" +#include "mfc_opr.h" +#include "mfc_sync.h" -#include "s5p_mfc_queue.h" -#include "s5p_mfc_utils.h" -#include "s5p_mfc_buf.h" -#include "s5p_mfc_mem.h" +#include "mfc_queue.h" +#include "mfc_utils.h" +#include "mfc_buf.h" +#include "mfc_mem.h" static int s5p_mfc_dec_queue_setup(struct vb2_queue *vq, unsigned int *buf_count, unsigned int *plane_count, diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_enc.c b/drivers/media/platform/exynos/mfc/mfc_enc.c similarity index 99% rename from drivers/media/platform/exynos/mfc/s5p_mfc_enc.c rename to drivers/media/platform/exynos/mfc/mfc_enc.c index 281cf8021c47..f32c507119dd 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_enc.c +++ b/drivers/media/platform/exynos/mfc/mfc_enc.c @@ -10,19 +10,19 @@ * (at your option) any later version. */ -#include "s5p_mfc_enc.h" -#include "s5p_mfc_enc_internal.h" - -#include "s5p_mfc_hwlock.h" -#include "s5p_mfc_otf.h" -#include "s5p_mfc_opr.h" -#include "s5p_mfc_sync.h" - -#include "s5p_mfc_qos.h" -#include "s5p_mfc_queue.h" -#include "s5p_mfc_utils.h" -#include "s5p_mfc_buf.h" -#include "s5p_mfc_mem.h" +#include "mfc_enc.h" +#include "mfc_enc_internal.h" + +#include "mfc_hwlock.h" +#include "mfc_otf.h" +#include "mfc_opr.h" +#include "mfc_sync.h" + +#include "mfc_qos.h" +#include "mfc_queue.h" +#include "mfc_utils.h" +#include "mfc_buf.h" +#include "mfc_mem.h" static struct s5p_mfc_fmt *mfc_enc_find_format(struct s5p_mfc_ctx *ctx, unsigned int pixelformat) diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_enc.h b/drivers/media/platform/exynos/mfc/mfc_enc.h similarity index 80% rename from drivers/media/platform/exynos/mfc/s5p_mfc_enc.h rename to drivers/media/platform/exynos/mfc/mfc_enc.h index 4cfbc2a8ac1d..bc0a0ad801fd 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_enc.h +++ b/drivers/media/platform/exynos/mfc/mfc_enc.h @@ -10,11 +10,11 @@ * (at your option) any later version. */ -#ifndef __S5P_MFC_ENC_H -#define __S5P_MFC_ENC_H __FILE__ +#ifndef __MFC_ENC_H +#define __MFC_ENC_H __FILE__ -#include "s5p_mfc_common.h" +#include "mfc_common.h" const struct v4l2_ioctl_ops *s5p_mfc_get_enc_v4l2_ioctl_ops(void); -#endif /* __S5P_MFC_ENC_H */ +#endif /* __MFC_ENC_H */ diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_enc_internal.h b/drivers/media/platform/exynos/mfc/mfc_enc_internal.h similarity index 99% rename from drivers/media/platform/exynos/mfc/s5p_mfc_enc_internal.h rename to drivers/media/platform/exynos/mfc/mfc_enc_internal.h index 80fbc0ef8582..60f35f66b2a1 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_enc_internal.h +++ b/drivers/media/platform/exynos/mfc/mfc_enc_internal.h @@ -10,10 +10,10 @@ * (at your option) any later version. */ -#ifndef __S5P_MFC_ENC_INTERNAL_H -#define __S5P_MFC_ENC_INTERNAL_H __FILE__ +#ifndef __MFC_ENC_INTERNAL_H +#define __MFC_ENC_INTERNAL_H __FILE__ -#include "s5p_mfc_common.h" +#include "mfc_common.h" /* * RGB encoding information to avoid confusion. @@ -2351,4 +2351,4 @@ static struct v4l2_queryctrl controls[] = { #define NUM_CTRLS ARRAY_SIZE(controls) -#endif /* __S5P_MFC_ENC_INTERNAL_H */ +#endif /* __MFC_ENC_INTERNAL_H */ diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_enc_ops.c b/drivers/media/platform/exynos/mfc/mfc_enc_ops.c similarity index 99% rename from drivers/media/platform/exynos/mfc/s5p_mfc_enc_ops.c rename to drivers/media/platform/exynos/mfc/mfc_enc_ops.c index eb812aaaf3ef..b688e73e4c29 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_enc_ops.c +++ b/drivers/media/platform/exynos/mfc/mfc_enc_ops.c @@ -10,9 +10,9 @@ * (at your option) any later version. */ -#include "s5p_mfc_common.h" +#include "mfc_common.h" -#include "s5p_mfc_reg.h" +#include "mfc_reg.h" static int mfc_enc_ctrl_read_cst(struct s5p_mfc_ctx *ctx, struct s5p_mfc_buf_ctrl *buf_ctrl) diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_enc_param.c b/drivers/media/platform/exynos/mfc/mfc_enc_param.c similarity index 99% rename from drivers/media/platform/exynos/mfc/s5p_mfc_enc_param.c rename to drivers/media/platform/exynos/mfc/mfc_enc_param.c index bfc323391817..e6ce770fb382 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_enc_param.c +++ b/drivers/media/platform/exynos/mfc/mfc_enc_param.c @@ -10,9 +10,9 @@ * (at your option) any later version. */ -#include "s5p_mfc_enc_param.h" +#include "mfc_enc_param.h" -#include "s5p_mfc_reg.h" +#include "mfc_reg.h" /* Definition */ #define FRAME_DELTA_DEFAULT 1 diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_enc_param.h b/drivers/media/platform/exynos/mfc/mfc_enc_param.h similarity index 86% rename from drivers/media/platform/exynos/mfc/s5p_mfc_enc_param.h rename to drivers/media/platform/exynos/mfc/mfc_enc_param.h index 86afc7ebded8..3e7fcf4d6f06 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_enc_param.h +++ b/drivers/media/platform/exynos/mfc/mfc_enc_param.h @@ -10,10 +10,10 @@ * (at your option) any later version. */ -#ifndef __S5P_MFC_ENC_PARAM_H -#define __S5P_MFC_ENC_PARAM_H __FILE__ +#ifndef __MFC_ENC_PARAM_H +#define __MFC_ENC_PARAM_H __FILE__ -#include "s5p_mfc_common.h" +#include "mfc_common.h" void s5p_mfc_set_slice_mode(struct s5p_mfc_ctx *ctx); void s5p_mfc_set_enc_params_h264(struct s5p_mfc_ctx *ctx); @@ -24,4 +24,4 @@ void s5p_mfc_set_enc_params_vp9(struct s5p_mfc_ctx *ctx); void s5p_mfc_set_enc_params_hevc(struct s5p_mfc_ctx *ctx); void s5p_mfc_set_enc_params_bpg(struct s5p_mfc_ctx *ctx); -#endif /* __S5P_MFC_ENC_PARAM_H */ +#endif /* __MFC_ENC_PARAM_H */ diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_enc_vb2_ops.c b/drivers/media/platform/exynos/mfc/mfc_enc_vb2_ops.c similarity index 98% rename from drivers/media/platform/exynos/mfc/s5p_mfc_enc_vb2_ops.c rename to drivers/media/platform/exynos/mfc/mfc_enc_vb2_ops.c index bc2e87270201..aade99ec62d0 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_enc_vb2_ops.c +++ b/drivers/media/platform/exynos/mfc/mfc_enc_vb2_ops.c @@ -10,18 +10,18 @@ * (at your option) any later version. */ -#include "s5p_mfc_common.h" - -#include "s5p_mfc_hwlock.h" -#include "s5p_mfc_nal_q.h" -#include "s5p_mfc_opr.h" -#include "s5p_mfc_sync.h" - -#include "s5p_mfc_qos.h" -#include "s5p_mfc_queue.h" -#include "s5p_mfc_utils.h" -#include "s5p_mfc_buf.h" -#include "s5p_mfc_mem.h" +#include "mfc_common.h" + +#include "mfc_hwlock.h" +#include "mfc_nal_q.h" +#include "mfc_opr.h" +#include "mfc_sync.h" + +#include "mfc_qos.h" +#include "mfc_queue.h" +#include "mfc_utils.h" +#include "mfc_buf.h" +#include "mfc_mem.h" static int s5p_mfc_enc_queue_setup(struct vb2_queue *vq, unsigned int *buf_count, unsigned int *plane_count, diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_hwfc_internal.h b/drivers/media/platform/exynos/mfc/mfc_hwfc_internal.h similarity index 89% rename from drivers/media/platform/exynos/mfc/s5p_mfc_hwfc_internal.h rename to drivers/media/platform/exynos/mfc/mfc_hwfc_internal.h index c505bbe36f0e..cb4a6bfe931d 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_hwfc_internal.h +++ b/drivers/media/platform/exynos/mfc/mfc_hwfc_internal.h @@ -10,10 +10,10 @@ * (at your option) any later version. */ -#ifndef __S5P_MFC_HWFC_INTERNAL_H -#define __S5P_MFC_HWFC_INTERNAL_H __FILE__ +#ifndef __MFC_HWFC_INTERNAL_H +#define __MFC_HWFC_INTERNAL_H __FILE__ -#include "s5p_mfc_common.h" +#include "mfc_common.h" /* * RGB encoding information to avoid confusion. @@ -53,4 +53,4 @@ struct s5p_mfc_fmt enc_hwfc_formats[] = { #define NUM_FORMATS ARRAY_SIZE(enc_hwfc_formats) -#endif /* __S5P_MFC_HWFC_INTERNAL_H */ +#endif /* __MFC_HWFC_INTERNAL_H */ diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_hwlock.c b/drivers/media/platform/exynos/mfc/mfc_hwlock.c similarity index 98% rename from drivers/media/platform/exynos/mfc/s5p_mfc_hwlock.c rename to drivers/media/platform/exynos/mfc/mfc_hwlock.c index cee635d62e5d..79cfb44f9e13 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_hwlock.c +++ b/drivers/media/platform/exynos/mfc/mfc_hwlock.c @@ -10,21 +10,21 @@ * (at your option) any later version. */ -#include "s5p_mfc_hwlock.h" +#include "mfc_hwlock.h" -#include "s5p_mfc_nal_q.h" -#include "s5p_mfc_otf.h" -#include "s5p_mfc_opr.h" -#include "s5p_mfc_sync.h" +#include "mfc_nal_q.h" +#include "mfc_otf.h" +#include "mfc_opr.h" +#include "mfc_sync.h" -#include "s5p_mfc_inst.h" -#include "s5p_mfc_pm.h" -#include "s5p_mfc_cmd.h" -#include "s5p_mfc_cal.h" -#include "s5p_mfc_reg.h" +#include "mfc_inst.h" +#include "mfc_pm.h" +#include "mfc_cmd.h" +#include "mfc_cal.h" +#include "mfc_reg.h" -#include "s5p_mfc_queue.h" -#include "s5p_mfc_utils.h" +#include "mfc_queue.h" +#include "mfc_utils.h" static inline void mfc_print_hwlock(struct s5p_mfc_dev *dev) { diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_hwlock.h b/drivers/media/platform/exynos/mfc/mfc_hwlock.h similarity index 94% rename from drivers/media/platform/exynos/mfc/s5p_mfc_hwlock.h rename to drivers/media/platform/exynos/mfc/mfc_hwlock.h index a9616a88d3ab..7e6a8a015338 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_hwlock.h +++ b/drivers/media/platform/exynos/mfc/mfc_hwlock.h @@ -10,10 +10,10 @@ * (at your option) any later version. */ -#ifndef __S5P_MFC_HWLOCK_H -#define __S5P_MFC_HWLOCK_H __FILE__ +#ifndef __MFC_HWLOCK_H +#define __MFC_HWLOCK_H __FILE__ -#include "s5p_mfc_common.h" +#include "mfc_common.h" static inline void s5p_mfc_init_listable_wq_dev(struct s5p_mfc_dev *dev) { @@ -80,4 +80,4 @@ int s5p_mfc_just_run(struct s5p_mfc_dev *dev, int new_ctx_index); void s5p_mfc_hwlock_handler_irq(struct s5p_mfc_dev *dev, struct s5p_mfc_ctx *ctx, unsigned int reason, unsigned int err); -#endif /* __S5P_MFC_HWLOCK_H */ +#endif /* __MFC_HWLOCK_H */ diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_inst.c b/drivers/media/platform/exynos/mfc/mfc_inst.c similarity index 97% rename from drivers/media/platform/exynos/mfc/s5p_mfc_inst.c rename to drivers/media/platform/exynos/mfc/mfc_inst.c index 1e9c130a16db..5d4e67ea37c5 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_inst.c +++ b/drivers/media/platform/exynos/mfc/mfc_inst.c @@ -10,15 +10,15 @@ * (at your option) any later version. */ -#include "s5p_mfc_inst.h" +#include "mfc_inst.h" -#include "s5p_mfc_cmd.h" -#include "s5p_mfc_enc_param.h" -#include "s5p_mfc_cal.h" -#include "s5p_mfc_perf_measure.h" -#include "s5p_mfc_reg.h" +#include "mfc_cmd.h" +#include "mfc_enc_param.h" +#include "mfc_cal.h" +#include "mfc_perf_measure.h" +#include "mfc_reg.h" -#include "s5p_mfc_utils.h" +#include "mfc_utils.h" int s5p_mfc_open_inst(struct s5p_mfc_ctx *ctx) { diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_inst.h b/drivers/media/platform/exynos/mfc/mfc_inst.h similarity index 87% rename from drivers/media/platform/exynos/mfc/s5p_mfc_inst.h rename to drivers/media/platform/exynos/mfc/mfc_inst.h index a82135e8e5c9..10b07ac60340 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_inst.h +++ b/drivers/media/platform/exynos/mfc/mfc_inst.h @@ -10,10 +10,10 @@ * (at your option) any later version. */ -#ifndef __S5P_MFC_INST_H -#define __S5P_MFC_INST_H __FILE__ +#ifndef __MFC_INST_H +#define __MFC_INST_H __FILE__ -#include "s5p_mfc_common.h" +#include "mfc_common.h" int s5p_mfc_open_inst(struct s5p_mfc_ctx *ctx); int s5p_mfc_close_inst(struct s5p_mfc_ctx *ctx); @@ -25,4 +25,4 @@ int s5p_mfc_decode_one_frame(struct s5p_mfc_ctx *ctx, int last_frame); int s5p_mfc_init_encode(struct s5p_mfc_ctx *ctx); int s5p_mfc_encode_one_frame(struct s5p_mfc_ctx *ctx, int last_frame); -#endif /* __S5P_MFC_INST_H */ +#endif /* __MFC_INST_H */ diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_irq.c b/drivers/media/platform/exynos/mfc/mfc_irq.c similarity index 99% rename from drivers/media/platform/exynos/mfc/s5p_mfc_irq.c rename to drivers/media/platform/exynos/mfc/mfc_irq.c index 731b119891a1..95136aff9c0c 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_irq.c +++ b/drivers/media/platform/exynos/mfc/mfc_irq.c @@ -10,24 +10,24 @@ * (at your option) any later version. */ -#include "s5p_mfc_irq.h" - -#include "s5p_mfc_hwlock.h" -#include "s5p_mfc_nal_q.h" -#include "s5p_mfc_otf.h" -#include "s5p_mfc_opr.h" -#include "s5p_mfc_sync.h" - -#include "s5p_mfc_pm.h" -#include "s5p_mfc_cal.h" -#include "s5p_mfc_perf_measure.h" -#include "s5p_mfc_reg.h" -#include "s5p_mfc_mmcache.h" - -#include "s5p_mfc_qos.h" -#include "s5p_mfc_queue.h" -#include "s5p_mfc_buf.h" -#include "s5p_mfc_mem.h" +#include "mfc_irq.h" + +#include "mfc_hwlock.h" +#include "mfc_nal_q.h" +#include "mfc_otf.h" +#include "mfc_opr.h" +#include "mfc_sync.h" + +#include "mfc_pm.h" +#include "mfc_cal.h" +#include "mfc_perf_measure.h" +#include "mfc_reg.h" +#include "mfc_mmcache.h" + +#include "mfc_qos.h" +#include "mfc_queue.h" +#include "mfc_buf.h" +#include "mfc_mem.h" static void mfc_handle_black_bar_info(struct s5p_mfc_dev *dev, struct s5p_mfc_ctx *ctx) { diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_irq.h b/drivers/media/platform/exynos/mfc/mfc_irq.h similarity index 84% rename from drivers/media/platform/exynos/mfc/s5p_mfc_irq.h rename to drivers/media/platform/exynos/mfc/mfc_irq.h index 9ef20f87f994..51ff3afecff1 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_irq.h +++ b/drivers/media/platform/exynos/mfc/mfc_irq.h @@ -10,14 +10,14 @@ * (at your option) any later version. */ -#ifndef __S5P_MFC_IRQ_H -#define __S5P_MFC_IRQ_H __FILE__ +#ifndef __MFC_IRQ_H +#define __MFC_IRQ_H __FILE__ #include -#include "s5p_mfc_common.h" +#include "mfc_common.h" -#include "s5p_mfc_utils.h" +#include "mfc_utils.h" irqreturn_t s5p_mfc_top_half_irq(int irq, void *priv); irqreturn_t s5p_mfc_irq(int irq, void *priv); @@ -29,4 +29,4 @@ static inline void s5p_mfc_handle_force_change_status(struct s5p_mfc_ctx *ctx) s5p_mfc_change_state(ctx, MFCINST_RUNNING); } -#endif /* __S5P_MFC_IRQ_H */ +#endif /* __MFC_IRQ_H */ diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_macros.h b/drivers/media/platform/exynos/mfc/mfc_macros.h similarity index 96% rename from drivers/media/platform/exynos/mfc/s5p_mfc_macros.h rename to drivers/media/platform/exynos/mfc/mfc_macros.h index cf0bb5acd0c6..b82cde483312 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_macros.h +++ b/drivers/media/platform/exynos/mfc/mfc_macros.h @@ -10,8 +10,8 @@ * (at your option) any later version. */ -#ifndef __S5P_MFC_MACROS_H -#define __S5P_MFC_MACROS_H __FILE__ +#ifndef __MFC_MACROS_H +#define __MFC_MACROS_H __FILE__ #define WIDTH_MB(x_size) ((x_size + 15) / 16) #define HEIGHT_MB(y_size) ((y_size + 15) / 16) @@ -66,4 +66,4 @@ #define ENC_V100_HEVC_ME_SIZE(x, y) \ (((x + 3) * (y + 3) * 32) + (((y * 128) + 2304) * (x + 3) / 4)) -#endif /* __S5P_MFC_MACROS_H */ +#endif /* __MFC_MACROS_H */ diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_mem.c b/drivers/media/platform/exynos/mfc/mfc_mem.c similarity index 99% rename from drivers/media/platform/exynos/mfc/s5p_mfc_mem.c rename to drivers/media/platform/exynos/mfc/mfc_mem.c index f104d1a0db04..f09819eb3de4 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_mem.c +++ b/drivers/media/platform/exynos/mfc/mfc_mem.c @@ -10,7 +10,7 @@ * (at your option) any later version. */ -#include "s5p_mfc_mem.h" +#include "mfc_mem.h" struct vb2_mem_ops *s5p_mfc_mem_ops(void) { diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_mem.h b/drivers/media/platform/exynos/mfc/mfc_mem.h similarity index 94% rename from drivers/media/platform/exynos/mfc/s5p_mfc_mem.h rename to drivers/media/platform/exynos/mfc/mfc_mem.h index cca58a968060..5a3a65b51fef 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_mem.h +++ b/drivers/media/platform/exynos/mfc/mfc_mem.h @@ -10,10 +10,10 @@ * (at your option) any later version. */ -#ifndef __S5P_MFC_MEM_H -#define __S5P_MFC_MEM_H __FILE__ +#ifndef __MFC_MEM_H +#define __MFC_MEM_H __FILE__ -#include "s5p_mfc_common.h" +#include "mfc_common.h" /* Offset base used to differentiate between CAPTURE and OUTPUT * while mmaping */ @@ -58,4 +58,4 @@ void s5p_mfc_mem_ion_free(struct s5p_mfc_dev *dev, void s5p_mfc_bufcon_put_daddr(struct s5p_mfc_ctx *ctx, struct s5p_mfc_buf *mfc_buf, int plane); int s5p_mfc_bufcon_get_daddr(struct s5p_mfc_ctx *ctx, struct s5p_mfc_buf *mfc_buf, struct dma_buf *bufcon_dmabuf, int plane); -#endif /* __S5P_MFC_MEM_H */ +#endif /* __MFC_MEM_H */ diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_mmcache.c b/drivers/media/platform/exynos/mfc/mfc_mmcache.c similarity index 99% rename from drivers/media/platform/exynos/mfc/s5p_mfc_mmcache.c rename to drivers/media/platform/exynos/mfc/mfc_mmcache.c index 416bfbb83fda..7385139abebb 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_mmcache.c +++ b/drivers/media/platform/exynos/mfc/mfc_mmcache.c @@ -10,9 +10,9 @@ * (at your option) any later version. */ -#include "s5p_mfc_mmcache.h" +#include "mfc_mmcache.h" -#include "s5p_mfc_reg.h" +#include "mfc_reg.h" static const unsigned char mmcache_SFR_0x0010[] = { 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_mmcache.h b/drivers/media/platform/exynos/mfc/mfc_mmcache.h similarity index 89% rename from drivers/media/platform/exynos/mfc/s5p_mfc_mmcache.h rename to drivers/media/platform/exynos/mfc/mfc_mmcache.h index f4cfa4d49928..c9f67af24d8d 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_mmcache.h +++ b/drivers/media/platform/exynos/mfc/mfc_mmcache.h @@ -10,10 +10,10 @@ * (at your option) any later version. */ -#ifndef __S5P_MFC_MMCACHE_H -#define __S5P_MFC_MMCACHE_H __FILE__ +#ifndef __MFC_MMCACHE_H +#define __MFC_MMCACHE_H __FILE__ -#include "s5p_mfc_common.h" +#include "mfc_common.h" #define MMCACHE_GLOBAL_CTRL 0x0000 #define MMCACHE_INVALIDATE_STATUS 0x0008 @@ -36,4 +36,4 @@ void s5p_mfc_mmcache_disable(struct s5p_mfc_dev *dev); /* Need HW lock to call this function */ void s5p_mfc_invalidate_mmcache(struct s5p_mfc_dev *dev); -#endif /* __S5P_MFC_MMCACHE_H */ +#endif /* __MFC_MMCACHE_H */ diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_nal_q.c b/drivers/media/platform/exynos/mfc/mfc_nal_q.c similarity index 99% rename from drivers/media/platform/exynos/mfc/s5p_mfc_nal_q.c rename to drivers/media/platform/exynos/mfc/mfc_nal_q.c index 64e6c8f5e7eb..74d330bf32c1 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_nal_q.c +++ b/drivers/media/platform/exynos/mfc/mfc_nal_q.c @@ -10,19 +10,19 @@ * (at your option) any later version. */ -#include "s5p_mfc_nal_q.h" +#include "mfc_nal_q.h" -#include "s5p_mfc_sync.h" +#include "mfc_sync.h" -#include "s5p_mfc_pm.h" -#include "s5p_mfc_cal.h" -#include "s5p_mfc_reg.h" +#include "mfc_pm.h" +#include "mfc_cal.h" +#include "mfc_reg.h" -#include "s5p_mfc_qos.h" -#include "s5p_mfc_queue.h" -#include "s5p_mfc_utils.h" -#include "s5p_mfc_buf.h" -#include "s5p_mfc_mem.h" +#include "mfc_qos.h" +#include "mfc_queue.h" +#include "mfc_utils.h" +#include "mfc_buf.h" +#include "mfc_mem.h" #define CBR_I_LIMIT_MAX 5 int s5p_mfc_nal_q_check_enable(struct s5p_mfc_dev *dev) diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_nal_q.h b/drivers/media/platform/exynos/mfc/mfc_nal_q.h similarity index 92% rename from drivers/media/platform/exynos/mfc/s5p_mfc_nal_q.h rename to drivers/media/platform/exynos/mfc/mfc_nal_q.h index f9b14a8ce2f5..ccf7900e3a4f 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_nal_q.h +++ b/drivers/media/platform/exynos/mfc/mfc_nal_q.h @@ -10,10 +10,10 @@ * (at your option) any later version. */ -#ifndef __S5P_MFC_NAL_Q_H -#define __S5P_MFC_NAL_Q_H __FILE__ +#ifndef __MFC_NAL_Q_H +#define __MFC_NAL_Q_H __FILE__ -#include "s5p_mfc_common.h" +#include "mfc_common.h" int s5p_mfc_nal_q_check_enable(struct s5p_mfc_dev *dev); @@ -36,4 +36,4 @@ int s5p_mfc_nal_q_enqueue_in_buf(struct s5p_mfc_dev *dev, struct s5p_mfc_ctx *ct EncoderOutputStr *s5p_mfc_nal_q_dequeue_out_buf(struct s5p_mfc_dev *dev, nal_queue_out_handle *nal_q_out_handle, unsigned int *reason); -#endif /* __S5P_MFC_NAL_Q_H */ +#endif /* __MFC_NAL_Q_H */ diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_opr.c b/drivers/media/platform/exynos/mfc/mfc_opr.c similarity index 98% rename from drivers/media/platform/exynos/mfc/s5p_mfc_opr.c rename to drivers/media/platform/exynos/mfc/mfc_opr.c index 2268854cf221..4fe9df0843b4 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_opr.c +++ b/drivers/media/platform/exynos/mfc/mfc_opr.c @@ -10,14 +10,14 @@ * (at your option) any later version. */ -#include "s5p_mfc_opr.h" +#include "mfc_opr.h" -#include "s5p_mfc_inst.h" -#include "s5p_mfc_reg.h" +#include "mfc_inst.h" +#include "mfc_reg.h" -#include "s5p_mfc_queue.h" -#include "s5p_mfc_utils.h" -#include "s5p_mfc_mem.h" +#include "mfc_queue.h" +#include "mfc_utils.h" +#include "mfc_mem.h" int s5p_mfc_run_dec_init(struct s5p_mfc_ctx *ctx) { diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_opr.h b/drivers/media/platform/exynos/mfc/mfc_opr.h similarity index 86% rename from drivers/media/platform/exynos/mfc/s5p_mfc_opr.h rename to drivers/media/platform/exynos/mfc/mfc_opr.h index 76c6e3559a3f..36bd24ff114c 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_opr.h +++ b/drivers/media/platform/exynos/mfc/mfc_opr.h @@ -10,10 +10,10 @@ * (at your option) any later version. */ -#ifndef __S5P_MFC_OPR_H -#define __S5P_MFC_OPR_H __FILE__ +#ifndef __MFC_OPR_H +#define __MFC_OPR_H __FILE__ -#include "s5p_mfc_common.h" +#include "mfc_common.h" int s5p_mfc_run_dec_init(struct s5p_mfc_ctx *ctx); int s5p_mfc_run_dec_frame(struct s5p_mfc_ctx *ctx); @@ -22,4 +22,4 @@ int s5p_mfc_run_enc_init(struct s5p_mfc_ctx *ctx); int s5p_mfc_run_enc_frame(struct s5p_mfc_ctx *ctx); int s5p_mfc_run_enc_last_frames(struct s5p_mfc_ctx *ctx); -#endif /* __S5P_MFC_OPR_H */ +#endif /* __MFC_OPR_H */ diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_otf.c b/drivers/media/platform/exynos/mfc/mfc_otf.c similarity index 98% rename from drivers/media/platform/exynos/mfc/s5p_mfc_otf.c rename to drivers/media/platform/exynos/mfc/mfc_otf.c index 62ba98a6b22d..08ed51de234c 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_otf.c +++ b/drivers/media/platform/exynos/mfc/mfc_otf.c @@ -18,21 +18,21 @@ #endif #include -#include "s5p_mfc_otf.h" -#include "s5p_mfc_hwfc_internal.h" +#include "mfc_otf.h" +#include "mfc_hwfc_internal.h" -#include "s5p_mfc_sync.h" +#include "mfc_sync.h" -#include "s5p_mfc_inst.h" -#include "s5p_mfc_pm.h" -#include "s5p_mfc_cmd.h" -#include "s5p_mfc_reg.h" +#include "mfc_inst.h" +#include "mfc_pm.h" +#include "mfc_cmd.h" +#include "mfc_reg.h" -#include "s5p_mfc_qos.h" -#include "s5p_mfc_queue.h" -#include "s5p_mfc_utils.h" -#include "s5p_mfc_buf.h" -#include "s5p_mfc_mem.h" +#include "mfc_qos.h" +#include "mfc_queue.h" +#include "mfc_utils.h" +#include "mfc_buf.h" +#include "mfc_mem.h" static struct s5p_mfc_fmt *mfc_enc_hwfc_find_format(unsigned int pixelformat) { diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_otf.h b/drivers/media/platform/exynos/mfc/mfc_otf.h similarity index 89% rename from drivers/media/platform/exynos/mfc/s5p_mfc_otf.h rename to drivers/media/platform/exynos/mfc/mfc_otf.h index e7b5e5788f45..d96e40353e9f 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_otf.h +++ b/drivers/media/platform/exynos/mfc/mfc_otf.h @@ -10,10 +10,10 @@ * (at your option) any later version. */ -#ifndef __S5P_MFC_OTF_H -#define __S5P_MFC_OTF_H __FILE__ +#ifndef __MFC_OTF_H +#define __MFC_OTF_H __FILE__ -#include "s5p_mfc_common.h" +#include "mfc_common.h" extern struct s5p_mfc_dev *g_mfc_dev; @@ -28,4 +28,4 @@ int s5p_mfc_otf_handle_seq(struct s5p_mfc_ctx *ctx); int s5p_mfc_otf_handle_stream(struct s5p_mfc_ctx *ctx); void s5p_mfc_otf_handle_error(struct s5p_mfc_ctx *ctx, unsigned int reason, unsigned int err); -#endif /* __S5P_MFC_OTF_H */ +#endif /* __MFC_OTF_H */ diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_perf_measure.c b/drivers/media/platform/exynos/mfc/mfc_perf_measure.c similarity index 95% rename from drivers/media/platform/exynos/mfc/s5p_mfc_perf_measure.c rename to drivers/media/platform/exynos/mfc/mfc_perf_measure.c index 47e7731ebf38..a6d335eef593 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_perf_measure.c +++ b/drivers/media/platform/exynos/mfc/mfc_perf_measure.c @@ -10,7 +10,7 @@ * (at your option) any later version. */ -#include "s5p_mfc_perf_measure.h" +#include "mfc_perf_measure.h" #ifndef PERF_MEASURE diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_perf_measure.h b/drivers/media/platform/exynos/mfc/mfc_perf_measure.h similarity index 94% rename from drivers/media/platform/exynos/mfc/s5p_mfc_perf_measure.h rename to drivers/media/platform/exynos/mfc/mfc_perf_measure.h index 7c4426bf4e11..ab7fe571d35c 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_perf_measure.h +++ b/drivers/media/platform/exynos/mfc/mfc_perf_measure.h @@ -10,12 +10,12 @@ * (at your option) any later version. */ -#ifndef __S5P_MFC_PERF_MEASURE_H -#define __S5P_MFC_PERF_MEASURE_H __FILE__ +#ifndef __MFC_PERF_MEASURE_H +#define __MFC_PERF_MEASURE_H __FILE__ #include -#include "s5p_mfc_reg.h" +#include "mfc_reg.h" void s5p_mfc_perf_register(struct s5p_mfc_dev *dev); void mfc_measure_init(void); @@ -103,4 +103,4 @@ static inline void s5p_mfc_perf_measure_off(struct s5p_mfc_dev *dev) #endif -#endif /* __S5P_MFC_PERF_MEASURE_H */ +#endif /* __MFC_PERF_MEASURE_H */ diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_pm.c b/drivers/media/platform/exynos/mfc/mfc_pm.c similarity index 98% rename from drivers/media/platform/exynos/mfc/s5p_mfc_pm.c rename to drivers/media/platform/exynos/mfc/mfc_pm.c index e301b539022a..b4db0562a3ad 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_pm.c +++ b/drivers/media/platform/exynos/mfc/mfc_pm.c @@ -14,10 +14,10 @@ #include #include -#include "s5p_mfc_pm.h" +#include "mfc_pm.h" -#include "s5p_mfc_cal.h" -#include "s5p_mfc_reg.h" +#include "mfc_cal.h" +#include "mfc_reg.h" void s5p_mfc_pm_init(struct s5p_mfc_dev *dev) { diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_pm.h b/drivers/media/platform/exynos/mfc/mfc_pm.h similarity index 90% rename from drivers/media/platform/exynos/mfc/s5p_mfc_pm.h rename to drivers/media/platform/exynos/mfc/mfc_pm.h index d185b578f06f..8e3aa6707bd3 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_pm.h +++ b/drivers/media/platform/exynos/mfc/mfc_pm.h @@ -10,10 +10,10 @@ * (at your option) any later version. */ -#ifndef __S5P_MFC_PM_H -#define __S5P_MFC_PM_H __FILE__ +#ifndef __MFC_PM_H +#define __MFC_PM_H __FILE__ -#include "s5p_mfc_common.h" +#include "mfc_common.h" static inline int s5p_mfc_pm_get_pwr_ref_cnt(struct s5p_mfc_dev *dev) { @@ -35,4 +35,4 @@ void s5p_mfc_pm_clock_off(struct s5p_mfc_dev *dev); int s5p_mfc_pm_power_on(struct s5p_mfc_dev *dev); int s5p_mfc_pm_power_off(struct s5p_mfc_dev *dev); -#endif /* __S5P_MFC_PM_H */ +#endif /* __MFC_PM_H */ diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_qos.c b/drivers/media/platform/exynos/mfc/mfc_qos.c similarity index 99% rename from drivers/media/platform/exynos/mfc/s5p_mfc_qos.c rename to drivers/media/platform/exynos/mfc/mfc_qos.c index 8655a4b17423..de6dd191b278 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_qos.c +++ b/drivers/media/platform/exynos/mfc/mfc_qos.c @@ -15,7 +15,7 @@ #include #endif -#include "s5p_mfc_qos.h" +#include "mfc_qos.h" #ifdef CONFIG_MFC_USE_BUS_DEVFREQ enum { diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_qos.h b/drivers/media/platform/exynos/mfc/mfc_qos.h similarity index 94% rename from drivers/media/platform/exynos/mfc/s5p_mfc_qos.h rename to drivers/media/platform/exynos/mfc/mfc_qos.h index a733a60f5296..783bda81b0f1 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_qos.h +++ b/drivers/media/platform/exynos/mfc/mfc_qos.h @@ -10,10 +10,10 @@ * (at your option) any later version. */ -#ifndef __S5P_MFC_QOS_H -#define __S5P_MFC_QOS_H __FILE__ +#ifndef __MFC_QOS_H +#define __MFC_QOS_H __FILE__ -#include "s5p_mfc_common.h" +#include "mfc_common.h" #define MFC_MAX_FPS (480000) #define DEC_DEFAULT_FPS (240000) @@ -72,4 +72,4 @@ static inline int s5p_mfc_qos_get_framerate(struct s5p_mfc_ctx *ctx) return ctx->framerate; } -#endif /* __S5P_MFC_QOS_H */ +#endif /* __MFC_QOS_H */ diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_queue.c b/drivers/media/platform/exynos/mfc/mfc_queue.c similarity index 99% rename from drivers/media/platform/exynos/mfc/s5p_mfc_queue.c rename to drivers/media/platform/exynos/mfc/mfc_queue.c index ccae643c6d3e..2dec6ab04f37 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_queue.c +++ b/drivers/media/platform/exynos/mfc/mfc_queue.c @@ -10,10 +10,10 @@ * (at your option) any later version. */ -#include "s5p_mfc_queue.h" +#include "mfc_queue.h" -#include "s5p_mfc_utils.h" -#include "s5p_mfc_mem.h" +#include "mfc_utils.h" +#include "mfc_mem.h" void s5p_mfc_add_tail_buf(spinlock_t *plock, struct s5p_mfc_buf_queue *queue, struct s5p_mfc_buf *mfc_buf) diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_queue.h b/drivers/media/platform/exynos/mfc/mfc_queue.h similarity index 97% rename from drivers/media/platform/exynos/mfc/s5p_mfc_queue.h rename to drivers/media/platform/exynos/mfc/mfc_queue.h index 8f50a27387a8..71dfc4245700 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_queue.h +++ b/drivers/media/platform/exynos/mfc/mfc_queue.h @@ -10,10 +10,10 @@ * (at your option) any later version. */ -#ifndef __S5P_MFC_QUEUE_H -#define __S5P_MFC_QUEUE_H __FILE__ +#ifndef __MFC_QUEUE_H +#define __MFC_QUEUE_H __FILE__ -#include "s5p_mfc_common.h" +#include "mfc_common.h" /** * enum s5p_mfc_queue_used_type @@ -157,4 +157,4 @@ void s5p_mfc_store_dpb(struct s5p_mfc_ctx *ctx, struct vb2_buffer *vb); void s5p_mfc_cleanup_nal_queue(struct s5p_mfc_ctx *ctx); int s5p_mfc_is_last_frame(struct s5p_mfc_ctx *ctx); -#endif /* __S5P_MFC_QUEUE_H */ +#endif /* __MFC_QUEUE_H */ diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_reg.c b/drivers/media/platform/exynos/mfc/mfc_reg.c similarity index 99% rename from drivers/media/platform/exynos/mfc/s5p_mfc_reg.c rename to drivers/media/platform/exynos/mfc/mfc_reg.c index bfc545da8811..1631025693eb 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_reg.c +++ b/drivers/media/platform/exynos/mfc/mfc_reg.c @@ -12,7 +12,7 @@ #include -#include "s5p_mfc_reg.h" +#include "mfc_reg.h" void s5p_mfc_dbg_enable(struct s5p_mfc_dev *dev) { diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_reg.h b/drivers/media/platform/exynos/mfc/mfc_reg.h similarity index 98% rename from drivers/media/platform/exynos/mfc/s5p_mfc_reg.h rename to drivers/media/platform/exynos/mfc/mfc_reg.h index c0414a39f9de..3e8be853f7d7 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_reg.h +++ b/drivers/media/platform/exynos/mfc/mfc_reg.h @@ -10,12 +10,12 @@ * (at your option) any later version. */ -#ifndef __S5P_MFC_REG_H -#define __S5P_MFC_REG_H __FILE__ +#ifndef __MFC_REG_H +#define __MFC_REG_H __FILE__ -#include "s5p_mfc_common.h" +#include "mfc_common.h" -#include "s5p_mfc_utils.h" +#include "mfc_utils.h" #define MFC_READL(offset) readl(dev->regs_base + (offset)) #define MFC_WRITEL(data, offset) writel((data), dev->regs_base + (offset)) @@ -268,4 +268,4 @@ int s5p_mfc_set_dynamic_dpb(struct s5p_mfc_ctx *ctx, struct s5p_mfc_buf *dst_vb) void s5p_mfc_set_pixel_format(struct s5p_mfc_dev *dev, unsigned int format); -#endif /* __S5P_MFC_REG_H */ +#endif /* __MFC_REG_H */ diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_regs_v10.h b/drivers/media/platform/exynos/mfc/mfc_regs_v10.h similarity index 100% rename from drivers/media/platform/exynos/mfc/s5p_mfc_regs_v10.h rename to drivers/media/platform/exynos/mfc/mfc_regs_v10.h diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_sync.c b/drivers/media/platform/exynos/mfc/mfc_sync.c similarity index 98% rename from drivers/media/platform/exynos/mfc/s5p_mfc_sync.c rename to drivers/media/platform/exynos/mfc/mfc_sync.c index 978f91c70da2..bc7b192a42d6 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_sync.c +++ b/drivers/media/platform/exynos/mfc/mfc_sync.c @@ -10,12 +10,12 @@ * (at your option) any later version. */ -#include "s5p_mfc_sync.h" +#include "mfc_sync.h" -#include "s5p_mfc_cal.h" -#include "s5p_mfc_perf_measure.h" +#include "mfc_cal.h" +#include "mfc_perf_measure.h" -#include "s5p_mfc_queue.h" +#include "mfc_queue.h" #define R2H_BIT(x) (((x) > 0) ? (1 << ((x) - 1)) : 0) diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_sync.h b/drivers/media/platform/exynos/mfc/mfc_sync.h similarity index 96% rename from drivers/media/platform/exynos/mfc/s5p_mfc_sync.h rename to drivers/media/platform/exynos/mfc/mfc_sync.h index c1cce5b69571..5c99de6e9d1c 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_sync.h +++ b/drivers/media/platform/exynos/mfc/mfc_sync.h @@ -10,10 +10,10 @@ * (at your option) any later version. */ -#ifndef __S5P_MFC_INTR_H -#define __S5P_MFC_INTR_H __FILE__ +#ifndef __MFC_INTR_H +#define __MFC_INTR_H __FILE__ -#include "s5p_mfc_common.h" +#include "mfc_common.h" #define need_to_dpb_flush(ctx) \ ((ctx->state == MFCINST_FINISHING) || \ @@ -119,4 +119,4 @@ static inline int s5p_mfc_is_work_to_do(struct s5p_mfc_dev *dev) return (!s5p_mfc_is_all_bits_cleared(&dev->work_bits)); } -#endif /* __S5P_MFC_INTR_H */ +#endif /* __MFC_INTR_H */ diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_utils.c b/drivers/media/platform/exynos/mfc/mfc_utils.c similarity index 99% rename from drivers/media/platform/exynos/mfc/s5p_mfc_utils.c rename to drivers/media/platform/exynos/mfc/mfc_utils.c index 7927c42c0c07..226147764353 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_utils.c +++ b/drivers/media/platform/exynos/mfc/mfc_utils.c @@ -12,7 +12,7 @@ #include -#include "s5p_mfc_utils.h" +#include "mfc_utils.h" int s5p_mfc_check_vb_with_fmt(struct s5p_mfc_fmt *fmt, struct vb2_buffer *vb) { diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_utils.h b/drivers/media/platform/exynos/mfc/mfc_utils.h similarity index 97% rename from drivers/media/platform/exynos/mfc/s5p_mfc_utils.h rename to drivers/media/platform/exynos/mfc/mfc_utils.h index e933321f3fdb..1a611a511612 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_utils.h +++ b/drivers/media/platform/exynos/mfc/mfc_utils.h @@ -10,10 +10,10 @@ * (at your option) any later version. */ -#ifndef __S5P_MFC_UTILS_H -#define __S5P_MFC_UTILS_H __FILE__ +#ifndef __MFC_UTILS_H +#define __MFC_UTILS_H __FILE__ -#include "s5p_mfc_common.h" +#include "mfc_common.h" static inline void s5p_mfc_clean_dev_int_flags(struct s5p_mfc_dev *dev) { @@ -177,4 +177,4 @@ void s5p_mfc_watchdog_start_tick(struct s5p_mfc_dev *dev); void s5p_mfc_watchdog_stop_tick(struct s5p_mfc_dev *dev); void s5p_mfc_watchdog_reset_tick(struct s5p_mfc_dev *dev); -#endif /* __S5P_MFC_UTILS_H */ +#endif /* __MFC_UTILS_H */ diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_watchdog.c b/drivers/media/platform/exynos/mfc/mfc_watchdog.c similarity index 98% rename from drivers/media/platform/exynos/mfc/s5p_mfc_watchdog.c rename to drivers/media/platform/exynos/mfc/mfc_watchdog.c index 17a1e8782b57..51a905b4feea 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_watchdog.c +++ b/drivers/media/platform/exynos/mfc/mfc_watchdog.c @@ -13,17 +13,17 @@ #include #endif -#include "s5p_mfc_watchdog.h" +#include "mfc_watchdog.h" -#include "s5p_mfc_sync.h" +#include "mfc_sync.h" -#include "s5p_mfc_pm.h" -#include "s5p_mfc_cmd.h" -#include "s5p_mfc_cal.h" -#include "s5p_mfc_reg.h" +#include "mfc_pm.h" +#include "mfc_cmd.h" +#include "mfc_cal.h" +#include "mfc_reg.h" -#include "s5p_mfc_queue.h" -#include "s5p_mfc_utils.h" +#include "mfc_queue.h" +#include "mfc_utils.h" #define MFC_SFR_AREA_COUNT 21 static void mfc_dump_regs(struct s5p_mfc_dev *dev) diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_watchdog.h b/drivers/media/platform/exynos/mfc/mfc_watchdog.h similarity index 78% rename from drivers/media/platform/exynos/mfc/s5p_mfc_watchdog.h rename to drivers/media/platform/exynos/mfc/mfc_watchdog.h index b715fb7a8156..4d01e1628401 100644 --- a/drivers/media/platform/exynos/mfc/s5p_mfc_watchdog.h +++ b/drivers/media/platform/exynos/mfc/mfc_watchdog.h @@ -10,11 +10,11 @@ * (at your option) any later version. */ -#ifndef __S5P_MFC_WATCHDOG_H -#define __S5P_MFC_WATCHDOG_H __FILE__ +#ifndef __MFC_WATCHDOG_H +#define __MFC_WATCHDOG_H __FILE__ -#include "s5p_mfc_common.h" +#include "mfc_common.h" void s5p_mfc_watchdog_worker(struct work_struct *work); -#endif /* __S5P_MFC_WATCHDOG_H */ +#endif /* __MFC_WATCHDOG_H */ -- 2.20.1