From patchwork Wed Sep 14 14:39:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 9332731 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DFFBD60231 for ; Thu, 15 Sep 2016 00:50:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CFA8E28DBA for ; Thu, 15 Sep 2016 00:50:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C40E928F7E; Thu, 15 Sep 2016 00:50:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 616BD28DBA for ; Thu, 15 Sep 2016 00:50:56 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2D0596E7D1; Thu, 15 Sep 2016 00:50:49 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from conuserg-08.nifty.com (conuserg-08.nifty.com [210.131.2.75]) by gabe.freedesktop.org (Postfix) with ESMTPS id E12896E763 for ; Wed, 14 Sep 2016 14:40:42 +0000 (UTC) Received: from grover.sesame (FL1-111-169-71-157.osk.mesh.ad.jp [111.169.71.157]) (authenticated) by conuserg-08.nifty.com with ESMTP id u8EEdDmQ016736; Wed, 14 Sep 2016 23:39:35 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com u8EEdDmQ016736 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1473863977; bh=NsB13v7O4VTHZTGVdpKHn4FTYc/CQ4m/0Lf0vX3wTI4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=o9PY0k9t49UFbp0fX+3SeMZmgcVvtDXHN52BcamZFWvKquj21wEvIU2Zal9OVw99O ywaTXXwBZsbX7ab+Siog40oza3jvN/Jn00j24fZXhrXZG25R9wi1BLqL8haqCHEpho OMVzpKO+TcgsvPpc5kFCqY/ujC8Ta6r1RrC/5Xi6xy3GNf3Jt96hkIi3Rf+4r3cC3/ aYBd3lSr2FvwCqP5ah29YVUar+orHzsUmGzDSUAtct3Unm61gNWiHv2CfYjPOeDl5J 4WbXkwKKIVjCzUWxLmNAyezGYblIUqgIHL68WXyye3qvv8VG0tW7BJKMjrVG5TnGQG WNLqY5I8eC65A== X-Nifty-SrcIP: [111.169.71.157] From: Masahiro Yamada To: David Airlie , dri-devel@lists.freedesktop.org Subject: [PATCH v2 4/5] drm/qxl: squash lines for simple wrapper functions Date: Wed, 14 Sep 2016 23:39:11 +0900 Message-Id: <1473863952-7658-5-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1473863952-7658-1-git-send-email-yamada.masahiro@socionext.com> References: <1473863952-7658-1-git-send-email-yamada.masahiro@socionext.com> X-Mailman-Approved-At: Thu, 15 Sep 2016 00:49:51 +0000 Cc: Daniel Vetter , linux-kernel@vger.kernel.org, Christian K?nig , Masahiro Yamada , Alexander Deucher , Dave Airlie , Gustavo Padovan , Dan Carpenter , Frediano Ziglio 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-Virus-Scanned: ClamAV using ClamSMTP Remove unneeded variables and assignments. Signed-off-by: Masahiro Yamada Reviewed-by: Gustavo Padovan Reviewed-by: Gustavo Padovan --- drivers/gpu/drm/qxl/qxl_draw.c | 7 ++----- drivers/gpu/drm/qxl/qxl_release.c | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/qxl/qxl_draw.c b/drivers/gpu/drm/qxl/qxl_draw.c index ffe8853..9b728ed 100644 --- a/drivers/gpu/drm/qxl/qxl_draw.c +++ b/drivers/gpu/drm/qxl/qxl_draw.c @@ -57,11 +57,8 @@ static struct qxl_rect *drawable_set_clipping(struct qxl_device *qdev, static int alloc_drawable(struct qxl_device *qdev, struct qxl_release **release) { - int ret; - ret = qxl_alloc_release_reserved(qdev, sizeof(struct qxl_drawable), - QXL_RELEASE_DRAWABLE, release, - NULL); - return ret; + return qxl_alloc_release_reserved(qdev, sizeof(struct qxl_drawable), + QXL_RELEASE_DRAWABLE, release, NULL); } static void diff --git a/drivers/gpu/drm/qxl/qxl_release.c b/drivers/gpu/drm/qxl/qxl_release.c index f599cd0..cd83f05 100644 --- a/drivers/gpu/drm/qxl/qxl_release.c +++ b/drivers/gpu/drm/qxl/qxl_release.c @@ -203,12 +203,9 @@ static long qxl_fence_wait(struct fence *fence, bool intr, signed long timeout) static int qxl_release_bo_alloc(struct qxl_device *qdev, struct qxl_bo **bo) { - int ret; /* pin releases bo's they are too messy to evict */ - ret = qxl_bo_create(qdev, PAGE_SIZE, false, true, - QXL_GEM_DOMAIN_VRAM, NULL, - bo); - return ret; + return qxl_bo_create(qdev, PAGE_SIZE, false, true, + QXL_GEM_DOMAIN_VRAM, NULL, bo); } int qxl_release_list_add(struct qxl_release *release, struct qxl_bo *bo)