From 91d295cf06aeee733b57ec87933dba47ed2c8440 Mon Sep 17 00:00:00 2001 From: Ville Syrjälä Date: Fri, 9 Oct 2015 17:00:29 +0300 Subject: Remove gem_mmap__{cpu,gtt,wc} return value MAP_FAILED asserts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit gem_mmap__{cpu,gtt,wc} never return MAP_FAILED, it gets converted to NULL internally. So don't go asserting that the returned value is not MAP_FAILED. Done with coccinelle: @@ type T; identifier I; @@ ( I = gem_mmap__gtt(...); | I = gem_mmap__cpu(...); | I = gem_mmap__wc(...); ) ... ( - igt_assert(I != MAP_FAILED); + igt_assert(I); | - igt_assert(I && I != MAP_FAILED); + igt_assert(I); | - igt_assert(I != (T *) MAP_FAILED); + igt_assert(I); | - igt_assert(I != NULL); + igt_assert(I); ) Signed-off-by: Ville Syrjälä Stochastically-reviwewed-by: Chris Wilson --- tests/gem_madvise.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/gem_madvise.c') diff --git a/tests/gem_madvise.c b/tests/gem_madvise.c index 359f4909..d0f378ef 100644 --- a/tests/gem_madvise.c +++ b/tests/gem_madvise.c @@ -78,7 +78,7 @@ dontneed_after_mmap(void) handle = gem_create(fd, OBJECT_SIZE); ptr = gem_mmap__gtt(fd, handle, OBJECT_SIZE, PROT_READ | PROT_WRITE); - igt_assert(ptr != NULL); + igt_assert(ptr); gem_madvise(fd, handle, I915_MADV_DONTNEED); close(fd); -- cgit v1.2.3