[igt-dev] [PATCH i-g-t] lib/intel_aux_pgtable: Removing duplicate max macro definition

Zbigniew Kempczyński zbigniew.kempczynski at intel.com
Wed Nov 20 18:10:14 UTC 2019


Remove code duplication which could lead to warning when header
in the include hierarchy will include igt_aux.h.

Signed-off-by: Zbigniew Kempczyński <zbigniew.kempczynski at intel.com>
Cc: Chris Wilson <chris at chris-wilson.co.uk>
---
 lib/intel_aux_pgtable.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/intel_aux_pgtable.c b/lib/intel_aux_pgtable.c
index ea909ec0..75cfdd20 100644
--- a/lib/intel_aux_pgtable.c
+++ b/lib/intel_aux_pgtable.c
@@ -2,6 +2,7 @@
 #include <stdint.h>
 
 #include "drmtest.h"
+#include "igt_aux.h"
 #include "intel_aux_pgtable.h"
 #include "intel_batchbuffer.h"
 #include "intel_bufmgr.h"
@@ -31,8 +32,6 @@
 
 #define GFX_ADDRESS_BITS	48
 
-#define max(a, b)		((a) > (b) ? (a) : (b))
-
 struct pgtable_level_desc {
 	int idx_shift;
 	int idx_bits;
-- 
2.23.0



More information about the igt-dev mailing list