[PATCH 11/11] guc-tidy

[Chris Wilson]

---
 drivers/gpu/drm/i915/i915_guc_submission.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_guc_submission.c b/drivers/gpu/drm/i915/i915_guc_submission.c
index 31ab64502f48..7894b816d1c6 100644
--- a/drivers/gpu/drm/i915/i915_guc_submission.c
+++ b/drivers/gpu/drm/i915/i915_guc_submission.c
@@ -496,15 +496,12 @@ static void guc_wq_item_append(struct i915_guc_client *gc,
 	const size_t wqi_size = sizeof(struct guc_wq_item);
 	const u32 wqi_len = wqi_size/sizeof(u32) - 1;
 	struct intel_engine_cs *engine = rq->engine;
-	struct guc_process_desc *desc;
+	struct guc_process_desc *desc = gc->vaddr + gc->proc_desc_offset;
 	struct guc_wq_item *wqi;
-	u32 freespace, tail, wq_off;
-
-	desc = gc->vaddr + gc->proc_desc_offset;
+	u32 tail, wq_off;
 
 	/* Free space is guaranteed, see i915_guc_wq_reserve() above */
-	freespace = CIRC_SPACE(gc->wq_tail, desc->head, gc->wq_size);
-	GEM_BUG_ON(freespace < wqi_size);
+	GEM_BUG_ON(CIRC_SPACE(gc->wq_tail, desc->head, gc->wq_size) < wqi_size);
 
 	/* The GuC firmware wants the tail index in QWords, not bytes */
 	tail = rq->tail;
-- 
2.10.2