From f52e7ec7876603b4edb0bff412255f8f1624ecc4 Mon Sep 17 00:00:00 2001 From: Ville Syrjälä Date: Fri, 9 Oct 2015 19:11:39 +0300 Subject: Replace __gem_mmap__{cpu,gtt,wc}() + igt_assert() with gem_mmap__{cpu,gtt,wc}() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit gem_mmap__{cpu,gtt,wc}() already has the assert built in, so replace __gem_mmap__{cpu,gtt,wc}() + igt_assert() with it. Mostly done with coccinelle, with some manual help: @@ identifier I; expression E1, E2, E3, E4, E5, E6; @@ ( - I = __gem_mmap__gtt(E1, E2, E3, E4); + I = gem_mmap__gtt(E1, E2, E3, E4); ... - igt_assert(I); | - I = __gem_mmap__cpu(E1, E2, E3, E4, E5); + I = gem_mmap__cpu(E1, E2, E3, E4, E5); ... - igt_assert(I); | - I = __gem_mmap__wc(E1, E2, E3, E4, E5); + I = gem_mmap__wc(E1, E2, E3, E4, E5); ... - igt_assert(I); ) Signed-off-by: Ville Syrjälä Stochastically-reviwewed-by: Chris Wilson --- tests/kms_fence_pin_leak.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'tests/kms_fence_pin_leak.c') diff --git a/tests/kms_fence_pin_leak.c b/tests/kms_fence_pin_leak.c index 41ce084d..7d4ffbcd 100644 --- a/tests/kms_fence_pin_leak.c +++ b/tests/kms_fence_pin_leak.c @@ -89,8 +89,7 @@ static void touch_fences(data_t *data) uint32_t handle = data->bos[i]->handle; void *ptr; - ptr = __gem_mmap__gtt(data->drm_fd, handle, 4096, PROT_WRITE); - igt_assert(ptr); + ptr = gem_mmap__gtt(data->drm_fd, handle, 4096, PROT_WRITE); gem_set_domain(data->drm_fd, handle, I915_GEM_DOMAIN_GTT, I915_GEM_DOMAIN_GTT); memset(ptr, 0, 4); munmap(ptr, 4096); -- cgit v1.2.3