From d28b9d27bf6c1c5e0dae591985442a25bbecab86 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri, 29 Aug 2014 17:30:40 +0100
Subject: [PATCH] igt: Tweak the igt_assert_cmpint macro

Minor tweak to embed the constant format string rather than passing it
to the vararg printf.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 lib/igt_core.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/igt_core.h b/lib/igt_core.h
index 3b9aa305..b4eb724f 100644
--- a/lib/igt_core.h
+++ b/lib/igt_core.h
@@ -281,7 +281,7 @@ void igt_exit(void) __attribute__((noreturn));
 		if (__n1 cmp __n2) ; else \
 		__igt_fail_assert(99, __FILE__, __LINE__, __func__, \
 				  #n1 " " #cmp " " #n2, \
-				  "error: %d %s %d\n", __n1, #ncmp, __n2); \
+				  "error: %d " #ncmp " %d\n", __n1, __n2); \
 	} while (0)
 
 #define igt_assert_cmpuint(n1, cmp, ncmp, n2) \
@@ -290,7 +290,7 @@ void igt_exit(void) __attribute__((noreturn));
 		if (__n1 cmp __n2) ; else \
 		__igt_fail_assert(99, __FILE__, __LINE__, __func__, \
 				  #n1 " " #cmp " " #n2, \
-				  "error: %#x %s %#x\n", __n1, #ncmp, __n2); \
+				  "error: %#x " #ncmp " %#x\n", __n1, __n2); \
 	} while (0)
 
 /**