diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2015-12-03 23:14:12 +0200 | 
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-12-11 09:26:59 +0100 | 
| commit | 2f8c19e771dcb3af974e46ffb512b592d70fb444 (patch) | |
| tree | 78e9d7dcabb14672393d71609ef5bda55f3315e5 /drivers/gpu/drm/drm_modes.c | |
| parent | 5ba894064d98547c82a1efd50eba40a92df777a1 (diff) | |
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: 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
Diffstat (limited to 'drivers/gpu/drm/drm_modes.c')
| -rw-r--r-- | drivers/gpu/drm/drm_modes.c | 36 | 
1 files changed, 18 insertions, 18 deletions
diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c index 6cd582fdcc4b..59c97ae0c68a 100644 --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c @@ -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) {  | 
