From: Emil Velikov <emil.velikov@collabora.com>
Date: Mon, 31 Jul 2017 18:45:27 +0000 (+0100)
Subject: i965: simplify intel_image_format_lookup()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=df8321370204434f2a7ca7cf29be973e060781ed;p=mesa.git

i965: simplify intel_image_format_lookup()

Drop the local variable and return directly.

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
---

diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c
index e9974a35d98..8ec3e03963f 100644
--- a/src/mesa/drivers/dri/i965/intel_screen.c
+++ b/src/mesa/drivers/dri/i965/intel_screen.c
@@ -349,16 +349,12 @@ intel_image_warn_if_unaligned(__DRIimage *image, const char *func)
 static const struct intel_image_format *
 intel_image_format_lookup(int fourcc)
 {
-   const struct intel_image_format *f = NULL;
-
    for (unsigned i = 0; i < ARRAY_SIZE(intel_image_formats); i++) {
-      if (intel_image_formats[i].fourcc == fourcc) {
-	 f = &intel_image_formats[i];
-	 break;
-      }
+      if (intel_image_formats[i].fourcc == fourcc)
+         return &intel_image_formats[i];
    }
 
-   return f;
+   return NULL;
 }
 
 static boolean intel_lookup_fourcc(int dri_format, int *fourcc)