diff options
author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2015-10-09 17:00:29 +0300 |
---|---|---|
committer | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2015-10-09 17:09:45 +0300 |
commit | 91d295cf06aeee733b57ec87933dba47ed2c8440 (patch) | |
tree | e7701a2e4470ae638d760266e0477f8ac5b689f6 /tests/drv_suspend.c | |
parent | 8986bbc0ce83c1df4c314c9c04d30608cacae98b (diff) |
Remove gem_mmap__{cpu,gtt,wc} return value MAP_FAILED asserts
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ä <ville.syrjala@linux.intel.com>
Stochastically-reviwewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'tests/drv_suspend.c')
-rw-r--r-- | tests/drv_suspend.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/drv_suspend.c b/tests/drv_suspend.c index 40142412..4e84d1ce 100644 --- a/tests/drv_suspend.c +++ b/tests/drv_suspend.c @@ -57,19 +57,19 @@ test_fence_restore(int fd, bool tiled2untiled, bool hibernate) /* Access the buffer objects in the order we want to have the laid out. */ ptr1 = gem_mmap__gtt(fd, handle1, OBJECT_SIZE, PROT_READ | PROT_WRITE); - igt_assert(ptr1 != MAP_FAILED); + igt_assert(ptr1); for (i = 0; i < OBJECT_SIZE/sizeof(uint32_t); i++) ptr1[i] = i; ptr_tiled = gem_mmap__gtt(fd, handle_tiled, OBJECT_SIZE, PROT_READ | PROT_WRITE); - igt_assert(ptr_tiled != MAP_FAILED); + igt_assert(ptr_tiled); if (tiled2untiled) gem_set_tiling(fd, handle_tiled, I915_TILING_X, 2048); for (i = 0; i < OBJECT_SIZE/sizeof(uint32_t); i++) ptr_tiled[i] = i; ptr2 = gem_mmap__gtt(fd, handle2, OBJECT_SIZE, PROT_READ | PROT_WRITE); - igt_assert(ptr2 != MAP_FAILED); + igt_assert(ptr2); for (i = 0; i < OBJECT_SIZE/sizeof(uint32_t); i++) ptr2[i] = i; |