drm: Remove useless else block

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>

1 files changed, 7 insertions, 7 deletions

diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index fa1b1a5b8330..4f4fcd37f110 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -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;
 
@@ -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++)
@@ -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;
 }
 
 /**