From patchwork Tue Jul 16 07:12:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 2827974 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 EC065C0AB2 for ; Tue, 16 Jul 2013 07:31:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AEF5D2011F for ; Tue, 16 Jul 2013 07:31:33 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id C2E2D20114 for ; Tue, 16 Jul 2013 07:31:32 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7D41AE6B37 for ; Tue, 16 Jul 2013 00:31:32 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-ea0-f180.google.com (mail-ea0-f180.google.com [209.85.215.180]) by gabe.freedesktop.org (Postfix) with ESMTP id DB132E6025 for ; Tue, 16 Jul 2013 00:17:16 -0700 (PDT) Received: by mail-ea0-f180.google.com with SMTP id k10so157810eaj.25 for ; Tue, 16 Jul 2013 00:17:16 -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=RMQQ/mG7xbi5FtEta0OhxIRb92PDMIEx6ZMna6eyKS8=; b=RkLnsIASZq/lXAcjNaSrLblo6Ja3RzqJ3HoH0OxSEouVvLhTL6I+xx5dIW1hnvvhIZ oojbLOhNpzGIHEl8XZ1XOX/ybmmoTfB9N75DueDX4K4dQb1b287D3skX7c8oBxLBpGJg XR5SsOVsECyXYp08wyJ/7Fh/u3KQk1etqLiTs= 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=RMQQ/mG7xbi5FtEta0OhxIRb92PDMIEx6ZMna6eyKS8=; b=fOH6amb7hqJwNjhmrGrr2ZVkcgPcDxL+iOlJW5pxVPtnS7p0L/1hVocvZ70fDVfo+7 HBgbhuLs92ayxDbM/W0xpTq9sNbV0PXMfyMEE+vJWN5E3iLF+uQG32xB9QlBMUOqIqv/ F7IL1tgLOTuDIHg/2d/0eYniAXifpoPGBqDMBpeNJTt5BQiOfsm59FdExbC2oBCUBjff HW4yDRRy8nccPIm0QtqtNjzb/4j7XIiy+cpqDjoxQ/wRl88AYPc51+DcI1/X39msPfj3 sKbe53zveeDXaJWYUvre4a+BBMLZq0X6s9Ib24uZxZ8ENxn1r9Jj9R+jQ/durPJQn2iU W3CQ== X-Received: by 10.14.5.68 with SMTP id 44mr68489eek.141.1373959036246; Tue, 16 Jul 2013 00:17:16 -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.14 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 16 Jul 2013 00:17:15 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 14/20] drm/prime: use proper pointer in drm_gem_prime_handle_to_fd Date: Tue, 16 Jul 2013 09:12:05 +0200 Message-Id: <1373958731-4132-15-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: ALoCoQmaQeBoWhBcIanNCJkmS7pxy5xeXrqi87x+Mgb0oM74QmeRPLPWQ/aaV1lH+0WA9Dy+EgnX 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 Part of the function uses the properly-typed dmabuf variable, the other an untyped void *buf. Kill the later. Signed-off-by: Daniel Vetter --- drivers/gpu/drm/drm_prime.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c index 02619d4..b76e694 100644 --- a/drivers/gpu/drm/drm_prime.c +++ b/drivers/gpu/drm/drm_prime.c @@ -306,7 +306,6 @@ int drm_gem_prime_handle_to_fd(struct drm_device *dev, int *prime_fd) { struct drm_gem_object *obj; - void *buf; int ret = 0; struct dma_buf *dmabuf; @@ -326,15 +325,15 @@ int drm_gem_prime_handle_to_fd(struct drm_device *dev, goto out_have_obj; } - buf = dev->driver->gem_prime_export(dev, obj, flags); - if (IS_ERR(buf)) { + dmabuf = dev->driver->gem_prime_export(dev, obj, flags); + if (IS_ERR(dmabuf)) { /* normally the created dma-buf takes ownership of the ref, * but if that fails then drop the ref */ - ret = PTR_ERR(buf); + ret = PTR_ERR(dmabuf); goto out; } - obj->export_dma_buf = buf; + obj->export_dma_buf = dmabuf; /* if we've exported this buffer the cheat and add it to the import list * so we get the correct handle back @@ -344,7 +343,7 @@ int drm_gem_prime_handle_to_fd(struct drm_device *dev, if (ret) goto fail_put_dmabuf; - ret = dma_buf_fd(buf, flags); + ret = dma_buf_fd(dmabuf, flags); if (ret < 0) goto fail_rm_handle; @@ -365,11 +364,12 @@ out_have_obj: goto out; fail_rm_handle: - drm_prime_remove_buf_handle_locked(&file_priv->prime, buf); + drm_prime_remove_buf_handle_locked(&file_priv->prime, + dmabuf); fail_put_dmabuf: /* clear NOT to be checked when releasing dma_buf */ obj->export_dma_buf = NULL; - dma_buf_put(buf); + dma_buf_put(dmabuf); out: drm_gem_object_unreference_unlocked(obj); mutex_unlock(&file_priv->prime.lock);