From patchwork Wed Dec 10 12:03:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 5468301 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 961CABEEA8 for ; Wed, 10 Dec 2014 12:04:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C2794200F4 for ; Wed, 10 Dec 2014 12:04:09 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id E1221200EC for ; Wed, 10 Dec 2014 12:04:08 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 112D56E556; Wed, 10 Dec 2014 04:04:08 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pa0-f47.google.com (mail-pa0-f47.google.com [209.85.220.47]) by gabe.freedesktop.org (Postfix) with ESMTP id 9CEF26E556 for ; Wed, 10 Dec 2014 04:04:07 -0800 (PST) Received: by mail-pa0-f47.google.com with SMTP id kq14so2683776pab.6 for ; Wed, 10 Dec 2014 04:04:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references; bh=UwZ0MCBUlMQUKgJjyzQC0Nz6DXkyNd5SJaxm1tyefvI=; b=nYgutS3YhXXFPkEsMEm6Ui6dsTYPW0MrLigs9r2WJPNA85jKJKTqgxKICYgv2ZLDh5 Yz4UjCHwBur6SxOLGmzmk0mzusdtpAuHqJumWhgfiN30WpF5F/v41+FtHkYHFZgWu9CZ XzCWRm2Bpwok4SDwsbtKkLVUVZu2tvvs0N96Q4nGhoK5xPME6kOURgg2ea7ToF3DjUAl Lmi88VqbpZ+WbNSeICdJ02Jxx41LlU1UpAOXhJiVQKjFzYrd+J3tzPS8wXRTGAO7LdoR RUd7lHvNNFe1t4z7LdX61gf47Yva3EmBrqAZIJuU1izkWGPAed+mPdevYMBiJ02N8eER PnmA== X-Received: by 10.70.34.162 with SMTP id a2mr6194096pdj.123.1418213047425; Wed, 10 Dec 2014 04:04:07 -0800 (PST) Received: from localhost ([216.228.120.20]) by mx.google.com with ESMTPSA id pu3sm3395392pdb.35.2014.12.10.04.04.06 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Dec 2014 04:04:06 -0800 (PST) From: Thierry Reding To: dri-devel@lists.freedesktop.org Subject: [PATCH 6/7] drm: Remove useless else block Date: Wed, 10 Dec 2014 13:03:39 +0100 Message-Id: <1418213020-6881-6-git-send-email-thierry.reding@gmail.com> X-Mailer: git-send-email 2.1.3 In-Reply-To: <1418213020-6881-1-git-send-email-thierry.reding@gmail.com> References: <1418213020-6881-1-git-send-email-thierry.reding@gmail.com> X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Thierry Reding 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 --- drivers/gpu/drm/drm_crtc.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index 654b1ae36f55..6888e1c7b936 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; } /**