Skip to content

Commit

Permalink
drm: Remove useless else block
Browse files Browse the repository at this point in the history
All prior conditional blocks return from the function, so the else block
can be at the top level of the function.

Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
Thierry Reding authored and Daniel Vetter committed Dec 10, 2014
1 parent 01073b0 commit 2ca651d
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions drivers/gpu/drm/drm_crtc.c
Original file line number Diff line number Diff line change
Expand Up @@ -4135,6 +4135,8 @@ EXPORT_SYMBOL(drm_mode_connector_update_edid_property);
static bool drm_property_change_is_valid(struct drm_property *property,
uint64_t value)
{
int i;

if (property->flags & DRM_MODE_PROP_IMMUTABLE)
return false;

Expand All @@ -4150,7 +4152,6 @@ static bool drm_property_change_is_valid(struct drm_property *property,
return false;
return true;
} else if (drm_property_type_is(property, DRM_MODE_PROP_BITMASK)) {
int i;
uint64_t valid_mask = 0;

for (i = 0; i < property->num_values; i++)
Expand All @@ -4174,13 +4175,12 @@ static bool drm_property_change_is_valid(struct drm_property *property,
*/
obj = _object_find(property->dev, value, property->values[0]);
return obj != NULL;
} else {
int i;
for (i = 0; i < property->num_values; i++)
if (property->values[i] == value)
return true;
return false;
}

for (i = 0; i < property->num_values; i++)
if (property->values[i] == value)
return true;
return false;
}

/**
Expand Down

0 comments on commit 2ca651d

Please sign in to comment.