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: 76220 Delivered-To: patch@linaro.org Received: by 10.140.106.72 with SMTP id d66csp1910682qgf; Wed, 14 Sep 2016 07:41:28 -0700 (PDT) X-Received: by 10.98.83.130 with SMTP id h124mr5180389pfb.154.1473864088074; Wed, 14 Sep 2016 07:41:28 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 15si33890740pfv.149.2016.09.14.07.41.27; Wed, 14 Sep 2016 07:41:28 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1764323AbcINOlN (ORCPT + 27 others); Wed, 14 Sep 2016 10:41:13 -0400 Received: from conuserg-08.nifty.com ([210.131.2.75]:50429 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1764154AbcINOlH (ORCPT ); Wed, 14 Sep 2016 10:41:07 -0400 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 Cc: Christian K?nig , Jani Nikula , Alexander Deucher , Masahiro Yamada , Daniel Vetter , Sumit Semwal , Frediano Ziglio , linux-kernel@vger.kernel.org, Gustavo Padovan , Dave Airlie , Dan Carpenter 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> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Remove unneeded variables and assignments. Signed-off-by: Masahiro Yamada --- drivers/gpu/drm/qxl/qxl_draw.c | 7 ++----- drivers/gpu/drm/qxl/qxl_release.c | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) -- 1.9.1 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)