[PATCH/RFC,017/390] drm/edid: Rewrite drm_mode_find_dmt search loop

Commit Message

Simon Horman March 29, 2013, 2:39 a.m. UTC

From: Adam Jackson <[e-mail]>

No functional change, but will make an upcoming change clearer.

Signed-off-by: Adam Jackson <[e-mail]>
Tested-by: Takashi Iwai <[e-mail]>
Reviewed-by: Rodrigo Vivi <[e-mail]>
Signed-off-by: Dave Airlie <[e-mail]>
(cherry picked from commit f8b46a05e6ced02e75cd782c015a57e67d5c644d)

Signed-off-by: Simon Horman <[e-mail]>
---
 drivers/gpu/drm/drm_edid.c |   19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

Patch

diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 626029c..38f5324 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -499,20 +499,21 @@  static void edid_fixup_preferred(struct drm_connector *connector,
 struct drm_display_mode *drm_mode_find_dmt(struct drm_device *dev,
 					   int hsize, int vsize, int fresh)
 {
-	struct drm_display_mode *mode = NULL;
 	int i;
 
 	for (i = 0; i < drm_num_dmt_modes; i++) {
 		const struct drm_display_mode *ptr = &drm_dmt_modes[i];
-		if (hsize == ptr->hdisplay &&
-			vsize == ptr->vdisplay &&
-			fresh == drm_mode_vrefresh(ptr)) {
-			/* get the expected default mode */
-			mode = drm_mode_duplicate(dev, ptr);
-			break;
-		}
+		if (hsize != ptr->hdisplay)
+			continue;
+		if (vsize != ptr->vdisplay)
+			continue;
+		if (fresh != drm_mode_vrefresh(ptr))
+			continue;
+
+		return drm_mode_duplicate(dev, ptr);
 	}
-	return mode;
+
+	return NULL;
 }
 EXPORT_SYMBOL(drm_mode_find_dmt);