Replace __gem_mmap__{cpu,gtt,wc}() + igt_assert() with gem_mmap__{cpu,gtt,wc}()

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ä <ville.syrjala@linux.intel.com>
Stochastically-reviwewed-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Ville Syrjälä
2015-10-09 19:11:39 +03:00
parent b8a77dd6c8
commit f52e7ec787
45 changed files with 158 additions and 261 deletions
+2 -3
View File
@@ -221,9 +221,8 @@ paint_color_key(struct igt_fb *fb_info)
int i, j;
uint32_t *fb_ptr;
fb_ptr = __gem_mmap__gtt(drm_fd, fb_info->gem_handle,
fb_info->size, PROT_READ | PROT_WRITE);
igt_assert(fb_ptr);
fb_ptr = gem_mmap__gtt(drm_fd, fb_info->gem_handle, fb_info->size,
PROT_READ | PROT_WRITE);
for (i = crtc_y; i < crtc_y + crtc_h; i++)
for (j = crtc_x; j < crtc_x + crtc_w; j++) {