diff options
| author | Thomas Wood <thomas.wood@intel.com> | 2015-01-13 13:33:57 +0000 |
|---|---|---|
| committer | Thomas Wood <thomas.wood@intel.com> | 2015-01-15 12:23:04 +0000 |
| commit | 032f30cb38bb03562ee7fde19cd278b1d8ac31a9 (patch) | |
| tree | ea6fea5eff9583a072c2f8174c00f57ab5cf1881 /lib | |
| parent | 07e9f3edb9dd8e99c2511b6b8c4cf750a5dbe536 (diff) | |
lib: remove unnecessary checks on the drm_open_any return value
drm_open_any always returns a valid file descriptor, so there is no need
to check the return value.
Signed-off-by: Thomas Wood <thomas.wood@intel.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/drmtest.c | 6 | ||||
| -rw-r--r-- | lib/igt.cocci | 14 |
2 files changed, 17 insertions, 3 deletions
diff --git a/lib/drmtest.c b/lib/drmtest.c index 813c315b..133a1537 100644 --- a/lib/drmtest.c +++ b/lib/drmtest.c @@ -302,10 +302,10 @@ static void quiescent_gpu_at_exit_render(int sig) /** * drm_open_any: * - * Open an i915 drm legacy device node. + * Open an i915 drm legacy device node. This function always returns a valid + * file descriptor. * - * Returns: - * The i915 drm file descriptor or -1 on error + * Returns: a i915 drm file descriptor */ int drm_open_any(void) { diff --git a/lib/igt.cocci b/lib/igt.cocci index 0d337bf7..fd4ad256 100644 --- a/lib/igt.cocci +++ b/lib/igt.cocci @@ -127,3 +127,17 @@ expression b; - ((a) >= (b) ? (a) : (b)) + max(a, b) ) + +// drm_open_any always returns a valid file descriptor +@@ +expression a; +@@ +a = drm_open_any(); +( +- igt_assert(a >= 0); +| +- if (a < 0) { +- ... +- return ...; +- } +) |