diff options
author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2015-10-09 19:11:39 +0300 |
---|---|---|
committer | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2015-10-12 19:57:58 +0300 |
commit | f52e7ec7876603b4edb0bff412255f8f1624ecc4 (patch) | |
tree | c8d668fd83f6f30c52c6ee0f89921299f0ad6eed /tests/prime_self_import.c | |
parent | b8a77dd6c8e9f73493b2f86f293ff9c06fc08049 (diff) |
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>
Diffstat (limited to 'tests/prime_self_import.c')
-rw-r--r-- | tests/prime_self_import.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/prime_self_import.c b/tests/prime_self_import.c index 23d349e9..91fe231e 100644 --- a/tests/prime_self_import.c +++ b/tests/prime_self_import.c @@ -60,10 +60,8 @@ check_bo(int fd1, uint32_t handle1, int fd2, uint32_t handle2) char *ptr1, *ptr2; int i; - ptr1 = __gem_mmap__gtt(fd1, handle1, BO_SIZE, PROT_READ | PROT_WRITE); - igt_assert(ptr1); - ptr2 = __gem_mmap__gtt(fd2, handle2, BO_SIZE, PROT_READ | PROT_WRITE); - igt_assert(ptr2); + ptr1 = gem_mmap__gtt(fd1, handle1, BO_SIZE, PROT_READ | PROT_WRITE); + ptr2 = gem_mmap__gtt(fd2, handle2, BO_SIZE, PROT_READ | PROT_WRITE); /* check whether it's still our old object first. */ for (i = 0; i < BO_SIZE; i++) { |