drm/ttm: Simplify ttm_bo_wait_unreserved

Function ttm_bo_wait_unreserved can be slightly simplified.

Signed-off-by: Jean Delvare <[email protected]>
Cc: Thomas Hellstrom <[email protected]>
Cc: Jerome Glisse <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>

diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
index 5ef0103bd0b60b722f55783c9c80e05cf2230aae..9f2eed520fc3d54af683388a08183599d813c6f5 100644 (file)
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@ -166,18 +166,13 @@ static void ttm_bo_release_list(struct kref *list_kref)
 
 int ttm_bo_wait_unreserved(struct ttm_buffer_object *bo, bool interruptible)
 {
-
        if (interruptible) {
-               int ret = 0;
-
-               ret = wait_event_interruptible(bo->event_queue,
+               return wait_event_interruptible(bo->event_queue,
                                               atomic_read(&bo->reserved) == 0);
-               if (unlikely(ret != 0))
-                       return ret;
        } else {
                wait_event(bo->event_queue, atomic_read(&bo->reserved) == 0);
+               return 0;
        }
-       return 0;
 }
 EXPORT_SYMBOL(ttm_bo_wait_unreserved);