From patchwork Tue Jul 16 07:12:07 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 2827976 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id BCDA59F9CA for ; Tue, 16 Jul 2013 07:33:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8295F2011F for ; Tue, 16 Jul 2013 07:33:08 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 5431C20114 for ; Tue, 16 Jul 2013 07:33:07 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 12191E6B41 for ; Tue, 16 Jul 2013 00:33:07 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-ee0-f52.google.com (mail-ee0-f52.google.com [74.125.83.52]) by gabe.freedesktop.org (Postfix) with ESMTP id CDA83E6AF7 for ; Tue, 16 Jul 2013 00:17:19 -0700 (PDT) Received: by mail-ee0-f52.google.com with SMTP id c50so157160eek.25 for ; Tue, 16 Jul 2013 00:17:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=w+YRhcbJha/khcrUr5LkMXF+meVyBBNwBLpnAp6v9oM=; b=I/GHXna9XjsH+IM7dvnQHF608987gNp1k7xEAjJ2XSJhr4q80kdxJWkpHVqN7SXplI 0WulhrFRXFNhWVtDsg6KWYGwnEexQ7pD4ANkm6rJfM72Q4BZPj+K8vAFzV6NcZockzP/ 06e6GLpiv3VMODO+sKwlbXWwuS4brqoylTZUU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=w+YRhcbJha/khcrUr5LkMXF+meVyBBNwBLpnAp6v9oM=; b=PzdQ+wJiBZAZGHUMPD5CwWDLWHRUc3Bm05Jc2jfqcKgYEhzVk7GgxxTtlmaqVm4o9b ZYSdqRQvBGGS/L0g33TwE95ZTyYrVMplWU5KOHuVja1HD2/W2Ozwf1dMH9ES6ND2Y8uR y/CVdhhC/PbKqTB4wlbThiEB4AIZTU2+/IaA1dIEko1zSN2eJChp1KV8Z0cN7AfKVENf ijbrbEM026vzptGKhMxCPDXc3cWwrsQYU9vaZxOiJsLgfT2yVDeEUCUTv4et8Trsl3QO ADXaOhyk1oOhI6qfV4CqwxDvaEb2OyNLt9C1hrjaSpmyt/s5ReMX5M/zKHWyAlK+A2KO oIQQ== X-Received: by 10.14.5.129 with SMTP id 1mr188744eel.56.1373959039177; Tue, 16 Jul 2013 00:17:19 -0700 (PDT) Received: from aaron.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPSA id n5sm283897eed.9.2013.07.16.00.17.17 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 16 Jul 2013 00:17:18 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 16/20] drm/prime: clarify logic a bit in drm_gem_prime_fd_to_handle Date: Tue, 16 Jul 2013 09:12:07 +0200 Message-Id: <1373958731-4132-17-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1373958731-4132-1-git-send-email-daniel.vetter@ffwll.ch> References: <1373958731-4132-1-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQn7Hmy9EcjhDs0kBNGY9W4M35LZN+kuS+xLuz6e4k6i4nUL2yfrVWcLIpgI/p+8kqdReAL5 Cc: Daniel Vetter X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org X-Spam-Status: No, score=-4.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,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 if (!ret) implies that ret == 0, so no need to clear it again. And explicitly check for ret == 0 to indicate that we're checking an errno integer. Signed-off-by: Daniel Vetter --- drivers/gpu/drm/drm_prime.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c index d8f4274..e4436c1 100644 --- a/drivers/gpu/drm/drm_prime.c +++ b/drivers/gpu/drm/drm_prime.c @@ -447,10 +447,8 @@ int drm_gem_prime_fd_to_handle(struct drm_device *dev, ret = drm_prime_lookup_buf_handle(&file_priv->prime, dma_buf, handle); - if (!ret) { - ret = 0; + if (ret == 0) goto out_put; - } /* never seen this one, need to import */ obj = dev->driver->gem_prime_import(dev, dma_buf);