From 00a0a68f4e2fdb044f6c8513850aa400e0fd9b0c Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Tue, 26 Jul 2022 11:01:41 +0800 Subject: [PATCH] MALI: midgard: Fix compile warning when !CONFIG_DEBUG_FS In file included from drivers/gpu/arm/midgard/backend/gpu/mali_kbase_mmu_hw_direct.c:22: drivers/gpu/arm/midgard/mali_kbase.h:600:9: warning: 'kbase_io_history_term' macro redefined [-Wmacro-redefined] #define kbase_io_history_term CSTD_NOP ^ drivers/gpu/arm/midgard/rename.h:139:9: note: previous definition is here #define kbase_io_history_term midgard_kbase_io_history_term ^ In file included from drivers/gpu/arm/midgard/mali_kbase_core_linux.c:42: drivers/gpu/arm/midgard/mali_kbase_regs_history_debugfs.h:46:9: warning: 'kbasep_regs_history_debugfs_init' macro redefined [-Wmacro-redefined] #define kbasep_regs_history_debugfs_init CSTD_NOP ^ drivers/gpu/arm/midgard/rename.h:326:9: note: previous definition is here #define kbasep_regs_history_debugfs_init midgard_kbasep_regs_history_debugfs_init ^ Signed-off-by: Tao Huang Change-Id: I8de63444cdb8d5cf265f3d6a80ab0ad69bec3754 --- drivers/gpu/arm/midgard/rename.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/gpu/arm/midgard/rename.h b/drivers/gpu/arm/midgard/rename.h index c94b67ff2c27..8218666183ea 100644 --- a/drivers/gpu/arm/midgard/rename.h +++ b/drivers/gpu/arm/midgard/rename.h @@ -129,9 +129,11 @@ #define kbase_instr_hwcnt_wait_for_dump midgard_kbase_instr_hwcnt_wait_for_dump #define kbase_invoke_smc_fid midgard_kbase_invoke_smc_fid #define kbase_invoke_smc midgard_kbase_invoke_smc +#if defined(CONFIG_DEBUG_FS) && !defined(CONFIG_MALI_NO_MALI) #define kbase_io_history_dump midgard_kbase_io_history_dump #define kbase_io_history_init midgard_kbase_io_history_init #define kbase_io_history_term midgard_kbase_io_history_term +#endif /* CONFIG_DEBUG_FS */ #define kbase_ipa_debugfs_init midgard_kbase_ipa_debugfs_init #define kbase_ipa_init midgard_kbase_ipa_init #define kbase_ipa_init_model midgard_kbase_ipa_init_model @@ -321,7 +323,9 @@ #define kbasep_platform_device_term midgard_kbasep_platform_device_term #define kbasep_pm_metrics_init midgard_kbasep_pm_metrics_init #define kbasep_pm_metrics_term midgard_kbasep_pm_metrics_term +#if defined(CONFIG_DEBUG_FS) && !defined(CONFIG_MALI_NO_MALI) #define kbasep_regs_history_debugfs_init midgard_kbasep_regs_history_debugfs_init +#endif /* CONFIG_DEBUG_FS */ #define kbasep_remove_waiting_soft_job midgard_kbasep_remove_waiting_soft_job #define kbase_prepare_soft_job midgard_kbase_prepare_soft_job #define kbase_prepare_to_reset_gpu_locked midgard_kbase_prepare_to_reset_gpu_locked