From e32bfc1ed78a584fa8ccc2c5ef873d8c5fef68e9 Mon Sep 17 00:00:00 2001 From: Ding Wei Date: Fri, 27 Aug 2021 16:49:31 +0800 Subject: [PATCH] video: rockchip: mpp: Use ROCKCHIP_MPP_PROC_FS instead of PROC_FS For kernel-tiny, remove debug relative code, and reduce the size of module. Change-Id: Ic78a0839a75c9cebb56fa32e87235bd97be0370a Signed-off-by: Ding Wei --- drivers/video/rockchip/mpp/Kconfig | 48 ++++++++----------- drivers/video/rockchip/mpp/mpp_common.c | 4 +- drivers/video/rockchip/mpp/mpp_common.h | 6 +-- drivers/video/rockchip/mpp/mpp_iep2.c | 4 +- drivers/video/rockchip/mpp/mpp_jpgdec.c | 4 +- drivers/video/rockchip/mpp/mpp_rkvdec.c | 4 +- drivers/video/rockchip/mpp/mpp_rkvdec2.c | 2 +- drivers/video/rockchip/mpp/mpp_rkvdec2.h | 2 +- drivers/video/rockchip/mpp/mpp_rkvdec2_link.c | 2 +- drivers/video/rockchip/mpp/mpp_rkvenc.c | 4 +- drivers/video/rockchip/mpp/mpp_service.c | 2 +- drivers/video/rockchip/mpp/mpp_vdpu1.c | 4 +- drivers/video/rockchip/mpp/mpp_vdpu2.c | 4 +- drivers/video/rockchip/mpp/mpp_vepu1.c | 4 +- drivers/video/rockchip/mpp/mpp_vepu2.c | 4 +- 15 files changed, 45 insertions(+), 53 deletions(-) diff --git a/drivers/video/rockchip/mpp/Kconfig b/drivers/video/rockchip/mpp/Kconfig index 28d23fc7193f..1a15dc9d5daf 100644 --- a/drivers/video/rockchip/mpp/Kconfig +++ b/drivers/video/rockchip/mpp/Kconfig @@ -3,69 +3,61 @@ menuconfig ROCKCHIP_MPP_SERVICE tristate "mpp service framework" depends on ARCH_ROCKCHIP - default n help rockchip mpp service framework. +if ROCKCHIP_MPP_SERVICE + +config ROCKCHIP_MPP_PROC_FS + bool "mpp service procfs" + depends on PROC_FS + default y + help + rockchip mpp service procfs. + config ROCKCHIP_MPP_RKVDEC - tristate "RKV decoder device driver" - depends on ROCKCHIP_MPP_SERVICE - default n + bool "RKV decoder device driver" help rockchip mpp rkv combo decoder and hevc decoder. config ROCKCHIP_MPP_RKVDEC2 - tristate "RKV decoder v2 device driver" - depends on ROCKCHIP_MPP_SERVICE - default n + bool "RKV decoder v2 device driver" help rockchip mpp rkv combo decoder v2. config ROCKCHIP_MPP_RKVENC - tristate "RKV encoder device driver" - depends on ROCKCHIP_MPP_SERVICE - default n + bool "RKV encoder device driver" help rockchip mpp rkv combo encoder. config ROCKCHIP_MPP_VDPU1 - tristate "VPU decoder v1 device driver" - depends on ROCKCHIP_MPP_SERVICE - default n + bool "VPU decoder v1 device driver" help rockchip mpp vpu decoder v1. config ROCKCHIP_MPP_VEPU1 - tristate "VPU encoder v1 device driver" - depends on ROCKCHIP_MPP_SERVICE - default n + bool "VPU encoder v1 device driver" help rockchip mpp vpu encoder v1. config ROCKCHIP_MPP_VDPU2 - tristate "VPU decoder v2 device driver" - depends on ROCKCHIP_MPP_SERVICE - default n + bool "VPU decoder v2 device driver" help rockchip mpp vpu decoder v2. config ROCKCHIP_MPP_VEPU2 - tristate "VPU encoder v2 device driver" - depends on ROCKCHIP_MPP_SERVICE - default n + bool "VPU encoder v2 device driver" help rockchip mpp vpu encoder v2. config ROCKCHIP_MPP_IEP2 - tristate "IEP v2 device driver" - depends on ROCKCHIP_MPP_SERVICE - default n + bool "IEP v2 device driver" help rockchip iep v2. config ROCKCHIP_MPP_JPGDEC - tristate "RKV jpeg decoder v1 device driver" - depends on ROCKCHIP_MPP_SERVICE - default n + bool "RKV jpeg decoder v1 device driver" help rockchip mpp rkv jpeg decoder. + +endif diff --git a/drivers/video/rockchip/mpp/mpp_common.c b/drivers/video/rockchip/mpp/mpp_common.c index 101497223bd0..e5123037f797 100644 --- a/drivers/video/rockchip/mpp/mpp_common.c +++ b/drivers/video/rockchip/mpp/mpp_common.c @@ -54,7 +54,7 @@ struct mpp_msg_v1 { __u64 data_ptr; }; -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_ROCKCHIP_MPP_PROC_FS const char *mpp_device_name[MPP_DEVICE_BUTT] = { [MPP_DEVICE_VDPU1] = "VDPU1", [MPP_DEVICE_VDPU2] = "VDPU2", @@ -2186,7 +2186,7 @@ int mpp_clk_set_rate(struct mpp_clk_info *clk_info, return 0; } -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_ROCKCHIP_MPP_PROC_FS static int fops_show_u32(struct seq_file *file, void *v) { u32 *val = file->private; diff --git a/drivers/video/rockchip/mpp/mpp_common.h b/drivers/video/rockchip/mpp/mpp_common.h index 317aefa363d6..306d489db8de 100644 --- a/drivers/video/rockchip/mpp/mpp_common.h +++ b/drivers/video/rockchip/mpp/mpp_common.h @@ -463,7 +463,7 @@ struct mpp_service { dev_t dev_id; struct cdev mpp_cdev; struct device *child_dev; -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_ROCKCHIP_MPP_PROC_FS struct proc_dir_entry *procfs; #endif unsigned long hw_support; @@ -731,7 +731,7 @@ static inline int mpp_reset_up_write(struct mpp_reset_group *group) return 0; } -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_ROCKCHIP_MPP_PROC_FS struct proc_dir_entry * mpp_procfs_create_u32(const char *name, umode_t mode, struct proc_dir_entry *parent, void *data); @@ -744,7 +744,7 @@ mpp_procfs_create_u32(const char *name, umode_t mode, } #endif -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_ROCKCHIP_MPP_PROC_FS extern const char *mpp_device_name[MPP_DEVICE_BUTT]; extern const char *enc_info_item_name[ENC_INFO_BUTT]; #endif diff --git a/drivers/video/rockchip/mpp/mpp_iep2.c b/drivers/video/rockchip/mpp/mpp_iep2.c index 6c193b97aa0f..31bb794ae094 100644 --- a/drivers/video/rockchip/mpp/mpp_iep2.c +++ b/drivers/video/rockchip/mpp/mpp_iep2.c @@ -216,7 +216,7 @@ struct iep2_dev { struct mpp_clk_info aclk_info; struct mpp_clk_info hclk_info; struct mpp_clk_info sclk_info; -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_ROCKCHIP_MPP_PROC_FS struct proc_dir_entry *procfs; #endif struct reset_control *rst_a; @@ -744,7 +744,7 @@ static int iep2_free_task(struct mpp_session *session, return 0; } -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_ROCKCHIP_MPP_PROC_FS static int iep2_procfs_remove(struct mpp_dev *mpp) { struct iep2_dev *iep = to_iep2_dev(mpp); diff --git a/drivers/video/rockchip/mpp/mpp_jpgdec.c b/drivers/video/rockchip/mpp/mpp_jpgdec.c index 495624138491..5f1def03ee00 100644 --- a/drivers/video/rockchip/mpp/mpp_jpgdec.c +++ b/drivers/video/rockchip/mpp/mpp_jpgdec.c @@ -94,7 +94,7 @@ struct jpgdec_dev { struct mpp_clk_info aclk_info; struct mpp_clk_info hclk_info; -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_ROCKCHIP_MPP_PROC_FS struct proc_dir_entry *procfs; #endif struct reset_control *rst_a; @@ -351,7 +351,7 @@ static int jpgdec_free_task(struct mpp_session *session, return 0; } -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_ROCKCHIP_MPP_PROC_FS static int jpgdec_procfs_remove(struct mpp_dev *mpp) { struct jpgdec_dev *dec = to_jpgdec_dev(mpp); diff --git a/drivers/video/rockchip/mpp/mpp_rkvdec.c b/drivers/video/rockchip/mpp/mpp_rkvdec.c index ebfb70054ebb..39b44759ebae 100644 --- a/drivers/video/rockchip/mpp/mpp_rkvdec.c +++ b/drivers/video/rockchip/mpp/mpp_rkvdec.c @@ -161,7 +161,7 @@ struct rkvdec_dev { struct mpp_clk_info cabac_clk_info; struct mpp_clk_info hevc_cabac_clk_info; u32 default_max_load; -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_ROCKCHIP_MPP_PROC_FS struct proc_dir_entry *procfs; #endif struct reset_control *rst_a; @@ -1145,7 +1145,7 @@ static int rkvdec_free_task(struct mpp_session *session, return 0; } -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_ROCKCHIP_MPP_PROC_FS static int rkvdec_procfs_remove(struct mpp_dev *mpp) { struct rkvdec_dev *dec = to_rkvdec_dev(mpp); diff --git a/drivers/video/rockchip/mpp/mpp_rkvdec2.c b/drivers/video/rockchip/mpp/mpp_rkvdec2.c index 882b2dad8e32..302ef66da2e3 100644 --- a/drivers/video/rockchip/mpp/mpp_rkvdec2.c +++ b/drivers/video/rockchip/mpp/mpp_rkvdec2.c @@ -557,7 +557,7 @@ static int rkvdec2_init_session(struct mpp_session *session) return 0; } -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_ROCKCHIP_MPP_PROC_FS static int rkvdec2_procfs_remove(struct mpp_dev *mpp) { struct rkvdec2_dev *dec = to_rkvdec2_dev(mpp); diff --git a/drivers/video/rockchip/mpp/mpp_rkvdec2.h b/drivers/video/rockchip/mpp/mpp_rkvdec2.h index f9302cd8412e..864590036651 100644 --- a/drivers/video/rockchip/mpp/mpp_rkvdec2.h +++ b/drivers/video/rockchip/mpp/mpp_rkvdec2.h @@ -170,7 +170,7 @@ struct rkvdec2_dev { struct mpp_clk_info cabac_clk_info; struct mpp_clk_info hevc_cabac_clk_info; u32 default_max_load; -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_ROCKCHIP_MPP_PROC_FS struct proc_dir_entry *procfs; #endif struct reset_control *rst_a; diff --git a/drivers/video/rockchip/mpp/mpp_rkvdec2_link.c b/drivers/video/rockchip/mpp/mpp_rkvdec2_link.c index a12deb17997c..589781bc53f3 100644 --- a/drivers/video/rockchip/mpp/mpp_rkvdec2_link.c +++ b/drivers/video/rockchip/mpp/mpp_rkvdec2_link.c @@ -865,7 +865,7 @@ err_free_node: return ret; } -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_ROCKCHIP_MPP_PROC_FS int rkvdec2_link_procfs_init(struct mpp_dev *mpp) { struct rkvdec2_dev *dec = to_rkvdec2_dev(mpp); diff --git a/drivers/video/rockchip/mpp/mpp_rkvenc.c b/drivers/video/rockchip/mpp/mpp_rkvenc.c index 1e8517852596..398cb0aa29b7 100644 --- a/drivers/video/rockchip/mpp/mpp_rkvenc.c +++ b/drivers/video/rockchip/mpp/mpp_rkvenc.c @@ -184,7 +184,7 @@ struct rkvenc_dev { struct mpp_clk_info hclk_info; struct mpp_clk_info core_clk_info; u32 default_max_load; -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_ROCKCHIP_MPP_PROC_FS struct proc_dir_entry *procfs; #endif struct reset_control *rst_a; @@ -714,7 +714,7 @@ static int rkvenc_init_session(struct mpp_session *session) return 0; } -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_ROCKCHIP_MPP_PROC_FS static int rkvenc_procfs_remove(struct mpp_dev *mpp) { struct rkvenc_dev *enc = to_rkvenc_dev(mpp); diff --git a/drivers/video/rockchip/mpp/mpp_service.c b/drivers/video/rockchip/mpp/mpp_service.c index b404c726d624..e87284be25d1 100644 --- a/drivers/video/rockchip/mpp/mpp_service.c +++ b/drivers/video/rockchip/mpp/mpp_service.c @@ -144,7 +144,7 @@ static int mpp_remove_service(struct mpp_service *srv) return 0; } -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_ROCKCHIP_MPP_PROC_FS static int mpp_procfs_remove(struct mpp_service *srv) { if (srv->procfs) { diff --git a/drivers/video/rockchip/mpp/mpp_vdpu1.c b/drivers/video/rockchip/mpp/mpp_vdpu1.c index 64de10990d51..f3b0c1dbe516 100644 --- a/drivers/video/rockchip/mpp/mpp_vdpu1.c +++ b/drivers/video/rockchip/mpp/mpp_vdpu1.c @@ -118,7 +118,7 @@ struct vdpu_dev { struct mpp_clk_info aclk_info; struct mpp_clk_info hclk_info; -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_ROCKCHIP_MPP_PROC_FS struct proc_dir_entry *procfs; #endif struct reset_control *rst_a; @@ -480,7 +480,7 @@ static int vdpu_free_task(struct mpp_session *session, return 0; } -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_ROCKCHIP_MPP_PROC_FS static int vdpu_procfs_remove(struct mpp_dev *mpp) { struct vdpu_dev *dec = to_vdpu_dev(mpp); diff --git a/drivers/video/rockchip/mpp/mpp_vdpu2.c b/drivers/video/rockchip/mpp/mpp_vdpu2.c index fb0eca81e6f5..98751eb3eab7 100644 --- a/drivers/video/rockchip/mpp/mpp_vdpu2.c +++ b/drivers/video/rockchip/mpp/mpp_vdpu2.c @@ -102,7 +102,7 @@ struct vdpu_dev { struct mpp_clk_info aclk_info; struct mpp_clk_info hclk_info; -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_ROCKCHIP_MPP_PROC_FS struct proc_dir_entry *procfs; #endif struct reset_control *rst_a; @@ -432,7 +432,7 @@ static int vdpu_free_task(struct mpp_session *session, return 0; } -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_ROCKCHIP_MPP_PROC_FS static int vdpu_procfs_remove(struct mpp_dev *mpp) { struct vdpu_dev *dec = to_vdpu_dev(mpp); diff --git a/drivers/video/rockchip/mpp/mpp_vepu1.c b/drivers/video/rockchip/mpp/mpp_vepu1.c index f140a0f828b9..1600a7735ffc 100644 --- a/drivers/video/rockchip/mpp/mpp_vepu1.c +++ b/drivers/video/rockchip/mpp/mpp_vepu1.c @@ -99,7 +99,7 @@ struct vepu_dev { struct mpp_clk_info aclk_info; struct mpp_clk_info hclk_info; -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_ROCKCHIP_MPP_PROC_FS struct proc_dir_entry *procfs; #endif struct reset_control *rst_a; @@ -467,7 +467,7 @@ static int vepu_init_session(struct mpp_session *session) return 0; } -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_ROCKCHIP_MPP_PROC_FS static int vepu_procfs_remove(struct mpp_dev *mpp) { struct vepu_dev *enc = to_vepu_dev(mpp); diff --git a/drivers/video/rockchip/mpp/mpp_vepu2.c b/drivers/video/rockchip/mpp/mpp_vepu2.c index 541366a4ae51..67f424af6a21 100644 --- a/drivers/video/rockchip/mpp/mpp_vepu2.c +++ b/drivers/video/rockchip/mpp/mpp_vepu2.c @@ -115,7 +115,7 @@ struct vepu_dev { struct mpp_clk_info aclk_info; struct mpp_clk_info hclk_info; u32 default_max_load; -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_ROCKCHIP_MPP_PROC_FS struct proc_dir_entry *procfs; #endif struct reset_control *rst_a; @@ -489,7 +489,7 @@ static int vepu_init_session(struct mpp_session *session) return 0; } -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_ROCKCHIP_MPP_PROC_FS static int vepu_procfs_remove(struct mpp_dev *mpp) { struct vepu_dev *enc = to_vepu_dev(mpp);