Commit 2f8c19e7 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter

drm: Flatten drm_mode_connector_list_update() a bit

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: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1449177255-9515-5-git-send-email-ville.syrjala@linux.intel.com
parent 5ba89406
...@@ -1184,30 +1184,30 @@ EXPORT_SYMBOL(drm_mode_sort); ...@@ -1184,30 +1184,30 @@ EXPORT_SYMBOL(drm_mode_sort);
void drm_mode_connector_list_update(struct drm_connector *connector, void drm_mode_connector_list_update(struct drm_connector *connector,
bool merge_type_bits) bool merge_type_bits)
{ {
struct drm_display_mode *mode;
struct drm_display_mode *pmode, *pt; struct drm_display_mode *pmode, *pt;
int found_it;
WARN_ON(!mutex_is_locked(&connector->dev->mode_config.mutex)); WARN_ON(!mutex_is_locked(&connector->dev->mode_config.mutex));
list_for_each_entry_safe(pmode, pt, &connector->probed_modes, list_for_each_entry_safe(pmode, pt, &connector->probed_modes, head) {
head) { struct drm_display_mode *mode;
found_it = 0; bool found_it = false;
/* go through current modes checking for the new probed mode */ /* go through current modes checking for the new probed mode */
list_for_each_entry(mode, &connector->modes, head) { list_for_each_entry(mode, &connector->modes, head) {
if (drm_mode_equal(pmode, mode)) { if (!drm_mode_equal(pmode, mode))
found_it = 1; continue;
/* if equal delete the probed mode */
mode->status = pmode->status; found_it = true;
/* Merge type bits together */ /* if equal delete the probed mode */
if (merge_type_bits) mode->status = pmode->status;
mode->type |= pmode->type; /* Merge type bits together */
else if (merge_type_bits)
mode->type = pmode->type; mode->type |= pmode->type;
list_del(&pmode->head); else
drm_mode_destroy(connector->dev, pmode); mode->type = pmode->type;
break; list_del(&pmode->head);
} drm_mode_destroy(connector->dev, pmode);
break;
} }
if (!found_it) { if (!found_it) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment