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/gem_mmap_gtt.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/gem_mmap_gtt.c')
-rw-r--r-- | tests/gem_mmap_gtt.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/gem_mmap_gtt.c b/tests/gem_mmap_gtt.c index 1624a6b7..5b782c9c 100644 --- a/tests/gem_mmap_gtt.c +++ b/tests/gem_mmap_gtt.c @@ -57,7 +57,7 @@ mmap_bo(int fd, uint32_t handle) void *ptr; ptr = gem_mmap__gtt(fd, handle, OBJECT_SIZE, PROT_READ | PROT_WRITE); - igt_assert(ptr != MAP_FAILED); + igt_assert(ptr); return ptr; } @@ -180,7 +180,7 @@ test_read_write(int fd, enum test_read_write order) handle = gem_create(fd, OBJECT_SIZE); ptr = gem_mmap__gtt(fd, handle, OBJECT_SIZE, PROT_READ | PROT_WRITE); - igt_assert(ptr != MAP_FAILED); + igt_assert(ptr); if (order == READ_BEFORE_WRITE) { val = *(uint32_t *)ptr; @@ -204,10 +204,10 @@ test_read_write2(int fd, enum test_read_write order) handle = gem_create(fd, OBJECT_SIZE); r = gem_mmap__gtt(fd, handle, OBJECT_SIZE, PROT_READ); - igt_assert(r != MAP_FAILED); + igt_assert(r); w = gem_mmap__gtt(fd, handle, OBJECT_SIZE, PROT_READ | PROT_WRITE); - igt_assert(w != MAP_FAILED); + igt_assert(w); if (order == READ_BEFORE_WRITE) { val = *(uint32_t *)r; @@ -441,10 +441,10 @@ test_write_cpu_read_gtt(int fd) handle = gem_create(fd, OBJECT_SIZE); dst = gem_mmap__gtt(fd, handle, OBJECT_SIZE, PROT_READ); - igt_assert(dst != (uint32_t *)MAP_FAILED); + igt_assert(dst); src = gem_mmap__cpu(fd, handle, 0, OBJECT_SIZE, PROT_WRITE); - igt_assert(src != (uint32_t *)MAP_FAILED); + igt_assert(src); gem_close(fd, handle); |