drm/amdkcl: drop individual tests for header files

Change-Id: Ibf7a76190a7dd84dc6776573f62f7784793f2303
Signed-off-by: Slava Grigorev <slava.grigorev@amd.com>
Reviewed-by: Flora Cui <flora.cui@amd.com>

24 files changed, 25 insertions, 25 deletions

diff --git a/include/kcl/header/kcl_drm_atomic_uapi_h.h b/include/kcl/header/kcl_drm_atomic_uapi_h.h
index af0e237b1d68..f91a5096cc95 100644
--- a/include/kcl/header/kcl_drm_atomic_uapi_h.h
+++ b/include/kcl/header/kcl_drm_atomic_uapi_h.h
@@ -2,7 +2,7 @@
 #ifndef AMDKCL_DRM_ATOMIC_UAPI_H_H
 #define AMDKCL_DRM_ATOMIC_UAPI_H_H
 
-#if defined(HAVE_DRM_ATOMIC_UAPI_HEADER)
+#if defined(HAVE_DRM_DRM_ATOMIC_UAPI_H)
 #include <drm/drm_atomic_uapi.h>
 #else
 #include <drm/drm_atomic.h>
diff --git a/include/kcl/header/kcl_drm_auth_h.h b/include/kcl/header/kcl_drm_auth_h.h
index c0a7a6027fe2..94d9e281112a 100644
--- a/include/kcl/header/kcl_drm_auth_h.h
+++ b/include/kcl/header/kcl_drm_auth_h.h
@@ -2,7 +2,7 @@
 #ifndef AMDKCL_DRM_AUTH_H_H
 #define AMDKCL_DRM_AUTH_H_H
 
-#ifdef HAVE_DRM_AUTH_H
+#ifdef HAVE_DRM_DRM_AUTH_H
 #include <drm/drm_auth.h>
 #else
 #include <kcl/header/kcl_drmP_h.h>
diff --git a/include/kcl/header/kcl_drm_connector_h.h b/include/kcl/header/kcl_drm_connector_h.h
index 1aceb6d09bfa..5f1e8a422282 100644
--- a/include/kcl/header/kcl_drm_connector_h.h
+++ b/include/kcl/header/kcl_drm_connector_h.h
@@ -2,7 +2,7 @@
 #ifndef AMDKCL_DRM_CONNECTOR_H_H
 #define AMDKCL_DRM_CONNECTOR_H_H
 
-#ifdef HAVE_DRM_CONNECTOR_H
+#ifdef HAVE_DRM_DRM_CONNECTOR_H
 #include <drm/drm_connector.h>
 #else
 #include <drm/drm_crtc.h>
diff --git a/include/kcl/header/kcl_drm_debugfs_h.h b/include/kcl/header/kcl_drm_debugfs_h.h
index 4ebf16c201c6..0c3552b581dc 100644
--- a/include/kcl/header/kcl_drm_debugfs_h.h
+++ b/include/kcl/header/kcl_drm_debugfs_h.h
@@ -2,7 +2,7 @@
 #ifndef AMDKCL_DRM_DEBUGFS_H_H
 #define AMDKCL_DRM_DEBUGFS_H_H
 
-#ifdef HAVE_DRM_DEBUGFS_H
+#ifdef HAVE_DRM_DRM_DEBUGFS_H
 #include <drm/drm_debugfs.h>
 #else
 #include <kcl/header/kcl_drmP_h.h>
diff --git a/include/kcl/header/kcl_drm_device_h.h b/include/kcl/header/kcl_drm_device_h.h
index 1e22b958280e..50d048464f94 100644
--- a/include/kcl/header/kcl_drm_device_h.h
+++ b/include/kcl/header/kcl_drm_device_h.h
@@ -2,7 +2,7 @@
 #ifndef AMDKCL_DRM_DEVICE_H_H
 #define AMDKCL_DRM_DEVICE_H_H
 
-#ifdef HAVE_DRM_DEVICE_H
+#ifdef HAVE_DRM_DRM_DEVICE_H
 #include <drm/drm_device.h>
 #else
 #include <kcl/header/kcl_drmP_h.h>
diff --git a/include/kcl/header/kcl_drm_encoder_h.h b/include/kcl/header/kcl_drm_encoder_h.h
index 7004bf1f6526..013f10fbd6d6 100644
--- a/include/kcl/header/kcl_drm_encoder_h.h
+++ b/include/kcl/header/kcl_drm_encoder_h.h
@@ -2,7 +2,7 @@
 #ifndef AMDKCL_DRM_ENCODER_H_H
 #define AMDKCL_DRM_ENCODER_H_H
 
-#ifdef HAVE_DRM_ENCODER_H
+#ifdef HAVE_DRM_DRM_ENCODER_H
 #include <drm/drm_encoder.h>
 #else
 #include <drm/drm_crtc.h>
diff --git a/include/kcl/header/kcl_drm_file_h.h b/include/kcl/header/kcl_drm_file_h.h
index dc957ba8e718..48c4e2fdf4a2 100644
--- a/include/kcl/header/kcl_drm_file_h.h
+++ b/include/kcl/header/kcl_drm_file_h.h
@@ -2,7 +2,7 @@
 #ifndef AMDKCL_DRM_FILE_H_H
 #define AMDKCL_DRM_FILE_H_H
 
-#ifdef HAVE_DRM_FILE_H
+#ifdef HAVE_DMR_DRM_FILE_H
 #include <drm/drm_file.h>
 #else
 #include <kcl/header/kcl_drmP_h.h>
diff --git a/include/kcl/header/kcl_drm_ioctl_h.h b/include/kcl/header/kcl_drm_ioctl_h.h
index 9a132bbab6a3..1b567de29bd8 100644
--- a/include/kcl/header/kcl_drm_ioctl_h.h
+++ b/include/kcl/header/kcl_drm_ioctl_h.h
@@ -2,7 +2,7 @@
 #ifndef AMDKCL_DRM_IOCTL_H_H
 #define AMDKCL_DRM_IOCTL_H_H
 
-#ifdef HAVE_DRM_IOCTL_H
+#ifdef HAVE_DRM_DRM_IOCTL_H
 #include <drm/drm_ioctl.h>
 #else
 #include <kcl/header/kcl_drmP_h.h>
diff --git a/include/kcl/header/kcl_drm_irq_h.h b/include/kcl/header/kcl_drm_irq_h.h
index 12520109fe7a..c147ea314d83 100644
--- a/include/kcl/header/kcl_drm_irq_h.h
+++ b/include/kcl/header/kcl_drm_irq_h.h
@@ -2,7 +2,7 @@
 #ifndef AMDKCL_DRM_IRQ_H_H
 #define AMDKCL_DRM_IRQ_H_H
 
-#ifdef HAVE_DRM_IRQ_H
+#ifdef HAVE_DRM_DRM_IRQ_H
 #include <drm/drm_irq.h>
 #else
 #include <kcl/header/kcl_drmP_h.h>
diff --git a/include/kcl/header/kcl_drm_plane_h.h b/include/kcl/header/kcl_drm_plane_h.h
index ee057ecdec87..5cdea2c7411d 100644
--- a/include/kcl/header/kcl_drm_plane_h.h
+++ b/include/kcl/header/kcl_drm_plane_h.h
@@ -2,7 +2,7 @@
 #ifndef AMDKCL_DRM_PLANE_H_H
 #define AMDKCL_DRM_PLANE_H_H
 
-#ifdef HAVE_DRM_PLANE_H
+#ifdef HAVE_DRM_DRM_PLANE_H
 #include <drm/drm_plane.h>
 #else
 #include <drm/drm_crtc.h>
diff --git a/include/kcl/header/kcl_drm_print_h.h b/include/kcl/header/kcl_drm_print_h.h
index dbf7230d784b..e622850d7665 100644
--- a/include/kcl/header/kcl_drm_print_h.h
+++ b/include/kcl/header/kcl_drm_print_h.h
@@ -2,7 +2,7 @@
 #ifndef AMDKCL_DRM_PRINT_H_H
 #define AMDKCL_DRM_PRINT_H_H
 
-#if defined(HAVE_DRM_PRINT_H)
+#if defined(HAVE_DRM_DRM_PRINT_H)
 #include <drm/drm_print.h>
 #endif
 #endif
diff --git a/include/kcl/header/kcl_drm_probe_helper_h.h b/include/kcl/header/kcl_drm_probe_helper_h.h
index 3af82291f092..b3fe643ce8c3 100644
--- a/include/kcl/header/kcl_drm_probe_helper_h.h
+++ b/include/kcl/header/kcl_drm_probe_helper_h.h
@@ -2,7 +2,7 @@
 #ifndef AMDKCL_DRM_PROBE_HELPER_H_H
 #define AMDKCL_DRM_PROBE_HELPER_H_H
 
-#ifdef HAVE_DRM_PROBE_HELPER_H
+#ifdef HAVE_DRM_DRM_PROBE_HELPER_H
 #include <drm/drm_probe_helper.h>
 #else
 #include <drm/drm_crtc_helper.h>
diff --git a/include/kcl/header/kcl_drm_util_h.h b/include/kcl/header/kcl_drm_util_h.h
index 1b15a9eb8ed1..22998a717944 100644
--- a/include/kcl/header/kcl_drm_util_h.h
+++ b/include/kcl/header/kcl_drm_util_h.h
@@ -2,7 +2,7 @@
 #ifndef AMDKCL_DRM_UTIL_H_H
 #define AMDKCL_DRM_UTIL_H_H
 
-#ifdef HAVE_DRM_UTIL_H
+#ifdef HAVE_DRM_DRM_UTIL_H
 #include <drm/drm_util.h>
 #else
 #include <kcl/header/kcl_drmP_h.h>
diff --git a/include/kcl/header/kcl_drm_vblank_h.h b/include/kcl/header/kcl_drm_vblank_h.h
index 3e590b51f50b..08fdd4982bd4 100644
--- a/include/kcl/header/kcl_drm_vblank_h.h
+++ b/include/kcl/header/kcl_drm_vblank_h.h
@@ -2,7 +2,7 @@
 #ifndef AMDKCL_DRM_VBLANK_H_H
 #define AMDKCL_DRM_VBLANK_H_H
 
-#ifdef HAVE_DRM_VBLANK_H
+#ifdef HAVE_DRM_DRM_VBLANK_H
 #include <drm/drm_vblank.h>
 #else
 #include <kcl/header/kcl_drm_irq_h.h>
diff --git a/include/kcl/header/kcl_kfifo_h.h b/include/kcl/header/kcl_kfifo_h.h
index 26992729bc2f..8a35d6989d9d 100644
--- a/include/kcl/header/kcl_kfifo_h.h
+++ b/include/kcl/header/kcl_kfifo_h.h
@@ -2,7 +2,7 @@
 #ifndef AMDKCL_KFIFO_H_H
 #define AMDKCL_KFIFO_H_H
 
-#if defined(HAVE_KFIFO_NEW_H)
+#if defined(HAVE_LINUX_KFIFO_NEW_H)
 #include <linux/kfifo-new.h>
 #else
 #include <linux/kfifo.h>
diff --git a/include/kcl/header/kcl_sched_mm_h.h b/include/kcl/header/kcl_sched_mm_h.h
index d0da6d6e0b1f..22788fe65a47 100644
--- a/include/kcl/header/kcl_sched_mm_h.h
+++ b/include/kcl/header/kcl_sched_mm_h.h
@@ -2,7 +2,7 @@
 #ifndef AMDKCL_SCHED_MM_H_H
 #define AMDKCL_SCHED_MM_H_H
 
-#if defined(HAVE_MM_H)
+#if defined(HAVE_LINUX_SCHED_MM_H)
 #include <linux/sched/mm.h>
 #else
 #include <linux/sched.h>
diff --git a/include/kcl/header/kcl_sched_signal_h.h b/include/kcl/header/kcl_sched_signal_h.h
index 22e8a38a58ff..b3d74124fb15 100644
--- a/include/kcl/header/kcl_sched_signal_h.h
+++ b/include/kcl/header/kcl_sched_signal_h.h
@@ -2,7 +2,7 @@
 #ifndef AMDKCL_SCHED_SIGNAL_H_H
 #define AMDKCL_SCHED_SIGNAL_H_H
 
-#if defined(HAVE_SIGNAL_H)
+#if defined(HAVE_LINUX_SCHED_SIGNAL_H)
 #include <linux/sched/signal.h>
 #endif
 #endif
diff --git a/include/kcl/header/kcl_sched_task_h.h b/include/kcl/header/kcl_sched_task_h.h
index 175b28c8e4e6..9e74ca933f79 100644
--- a/include/kcl/header/kcl_sched_task_h.h
+++ b/include/kcl/header/kcl_sched_task_h.h
@@ -2,7 +2,7 @@
 #ifndef AMDKCL_SCHED_TASK_H_H
 #define AMDKCL_SCHED_TASK_H_H
 
-#if defined(HAVE_TASK_H)
+#if defined(HAVE_LINUX_SCHED_TASK_H)
 #include <linux/sched/task.h>
 #endif
 #endif
diff --git a/include/kcl/header/kcl_set_memory_h.h b/include/kcl/header/kcl_set_memory_h.h
index 1818bd2c1d3b..980773770d2e 100644
--- a/include/kcl/header/kcl_set_memory_h.h
+++ b/include/kcl/header/kcl_set_memory_h.h
@@ -2,7 +2,7 @@
 #ifndef AMDKCL_SET_MEMORY_H_H
 #define AMDKCL_SET_MEMORY_H_H
 
-#if defined(HAVE_SET_MEMORY_H)
+#if defined(HAVE_ASM_SET_MEMORY_H)
 #include <asm/set_memory.h>
 #else
 #include <asm/cacheflush.h>
diff --git a/include/kcl/header/kcl_uapi_linux_sched_types_h.h b/include/kcl/header/kcl_uapi_linux_sched_types_h.h
index 632b09589192..dfd703f14557 100644
--- a/include/kcl/header/kcl_uapi_linux_sched_types_h.h
+++ b/include/kcl/header/kcl_uapi_linux_sched_types_h.h
@@ -2,7 +2,7 @@
 #ifndef AMDKCL_UAPI_LINUX_SCHED_TYPES_H_H
 #define AMDKCL_UAPI_LINUX_SCHED_TYPES_H_H
 
-#ifdef HAVE_SCHED_TYPES_H
+#ifdef HAVE_UAPI_LINUX_SCHED_TYPES_H
 #include <uapi/linux/sched/types.h>
 #endif
 #endif
diff --git a/include/kcl/kcl_drm.h b/include/kcl/kcl_drm.h
index af2eb7841fcd..ce5246b424ee 100644
--- a/include/kcl/kcl_drm.h
+++ b/include/kcl/kcl_drm.h
@@ -223,7 +223,7 @@ bool drm_is_current_master(struct drm_file *fpriv);
 u64 drm_get_max_iomem(void);
 #endif
 
-#if !defined(HAVE_DRM_PRINT_H)
+#if !defined(HAVE_DRM_DRM_PRINT_H)
 struct drm_printer {
 	void (*printfn)(struct drm_printer *p, struct va_format *vaf);
 	void *arg;
@@ -283,7 +283,7 @@ static inline struct drm_printer drm_debug_printer(const char *prefix)
 {
 	struct drm_printer p = {
 		.printfn = __drm_printfn_debug,
-#if !defined(HAVE_DRM_PRINT_H)
+#if !defined(HAVE_DRM_DRM_PRINT_H)
 		.prefix = prefix
 #endif
 	};
diff --git a/include/kcl/kcl_interval_tree_generic.h b/include/kcl/kcl_interval_tree_generic.h
index 0248e60bc3a6..96890fcbe297 100644
--- a/include/kcl/kcl_interval_tree_generic.h
+++ b/include/kcl/kcl_interval_tree_generic.h
@@ -21,7 +21,7 @@
 */
 
 #include <linux/rbtree.h>
-#if defined(HAVE_INTERVAL_TREE_DEFINE)
+#if defined(HAVE_LINUX_INTERVAL_TREE_GENERIC_H)
 #include <linux/interval_tree_generic.h>
 #else
 
diff --git a/include/kcl/kcl_overflow.h b/include/kcl/kcl_overflow.h
index 273544766d1b..4195bb5fce1c 100644
--- a/include/kcl/kcl_overflow.h
+++ b/include/kcl/kcl_overflow.h
@@ -3,7 +3,7 @@
 #ifndef AMDKCL_OVERFLOW_H
 #define AMDKCL_OVERFLOW_H
 
-#ifdef HAVE_OVERFLOW_H
+#ifdef HAVE_LINUX_OVERFLOW_H
 #include <linux/overflow.h>
 #endif
 
diff --git a/include/kcl/kcl_task_barrier.h b/include/kcl/kcl_task_barrier.h
index 5107dfbe55c3..341fe8e02a9d 100644
--- a/include/kcl/kcl_task_barrier.h
+++ b/include/kcl/kcl_task_barrier.h
@@ -2,7 +2,7 @@
 #ifndef AMDKCL_DRM_TASK_BARRIER_H
 #define AMDKCL_DRM_TASK_BARRIER_H
 
-#ifdef HAVE_TASK_BARRIER_H
+#ifdef HAVE_DRM_TASK_BARRIER_H
 #include <drm/task_barrier.h>
 #else
 /*