drm: Flatten drm_mode_connector_list_update() a bit
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Thu, 3 Dec 2015 21:14:12 +0000 (23:14 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 11 Dec 2015 08:26:59 +0000 (09:26 +0100)
Use 'continue' to eliminate one indent level from
drm_mode_connector_list_update(). And while at it,
make 'found_it' bool.

Cc: Adam Jackson <ajax@redhat.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1449177255-9515-5-git-send-email-ville.syrjala@linux.intel.com
drivers/gpu/drm/drm_modes.c

index 6cd582fdcc4b882c9a46d696571444b91bc4634a..59c97ae0c68a72f9eed56fe067b39d25ffa149b6 100644 (file)
@@ -1184,30 +1184,30 @@ EXPORT_SYMBOL(drm_mode_sort);
 void drm_mode_connector_list_update(struct drm_connector *connector,
                                    bool merge_type_bits)
 {
-       struct drm_display_mode *mode;
        struct drm_display_mode *pmode, *pt;
-       int found_it;
 
        WARN_ON(!mutex_is_locked(&connector->dev->mode_config.mutex));
 
-       list_for_each_entry_safe(pmode, pt, &connector->probed_modes,
-                                head) {
-               found_it = 0;
+       list_for_each_entry_safe(pmode, pt, &connector->probed_modes, head) {
+               struct drm_display_mode *mode;
+               bool found_it = false;
+
                /* go through current modes checking for the new probed mode */
                list_for_each_entry(mode, &connector->modes, head) {
-                       if (drm_mode_equal(pmode, mode)) {
-                               found_it = 1;
-                               /* if equal delete the probed mode */
-                               mode->status = pmode->status;
-                               /* Merge type bits together */
-                               if (merge_type_bits)
-                                       mode->type |= pmode->type;
-                               else
-                                       mode->type = pmode->type;
-                               list_del(&pmode->head);
-                               drm_mode_destroy(connector->dev, pmode);
-                               break;
-                       }
+                       if (!drm_mode_equal(pmode, mode))
+                               continue;
+
+                       found_it = true;
+                       /* if equal delete the probed mode */
+                       mode->status = pmode->status;
+                       /* Merge type bits together */
+                       if (merge_type_bits)
+                               mode->type |= pmode->type;
+                       else
+                               mode->type = pmode->type;
+                       list_del(&pmode->head);
+                       drm_mode_destroy(connector->dev, pmode);
+                       break;
                }
 
                if (!found_it) {