From patchwork Wed Sep 14 14:39:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 9332727 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 78A7C60231 for ; Thu, 15 Sep 2016 00:50:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 663B828F3A for ; Thu, 15 Sep 2016 00:50:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5664028F7E; Thu, 15 Sep 2016 00:50:41 +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=unavailable 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 DF56228F3A for ; Thu, 15 Sep 2016 00:50:40 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 938F96E2AF; Thu, 15 Sep 2016 00:49:58 +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 554DF6E74F; Wed, 14 Sep 2016 14:40:22 +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 u8EEdDmR016736; Wed, 14 Sep 2016 23:39:37 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com u8EEdDmR016736 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1473863978; bh=tcjB4ER6uMvxEhJLtw9G0xwvyIRZTXEmTXx9/LKTXNY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GIDXR6jGsfj5YBrPUqdYfwvHV/l0t49mNEhKOYq7RgXLepxbsIxVX4mMOebwX7PbL UMYr4jJNM2Fv40oh431mxTg4YmfKZ12ACDngG39K2LQhAesq9oMIDhU8GgfPdgkE9s 3eIU3Juoqdmj1jVUBBpCD0leb2BqeKKoInkivdyCFKtdgNUJRje2jSYerQVXGItaPY 58qzlgbn9rTm6xt+vzxuoDaWA5D94jVHTLu+0HNyWWvoNC6c2gbyQbWWu58IykndrG DG+sf/C5ThjUlL1uMbVRdQAl9ZpVbNLpDYRYGZlmg7i8qP2SBafo5PlHAePaQggcky Oj2yhYu/cWP5A== X-Nifty-SrcIP: [111.169.71.157] From: Masahiro Yamada To: David Airlie , dri-devel@lists.freedesktop.org Subject: [PATCH v2 5/5] drm/i915: use i915_gem_open() directly instead of i915_driver_open() Date: Wed, 14 Sep 2016 23:39:12 +0900 Message-Id: <1473863952-7658-6-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: intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, Masahiro Yamada , Alexander Deucher , Daniel Vetter , Christian K?nig 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 i915_driver_open() is equivalent to i915_gem_open(). Replace the i915_driver_open with the direct use of i915_gem_open(). Signed-off-by: Masahiro Yamada --- drivers/gpu/drm/i915/i915_drv.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 7f4e8ad..d3a33c4 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -1322,17 +1322,6 @@ void i915_driver_unload(struct drm_device *dev) i915_driver_cleanup_early(dev_priv); } -static int i915_driver_open(struct drm_device *dev, struct drm_file *file) -{ - int ret; - - ret = i915_gem_open(dev, file); - if (ret) - return ret; - - return 0; -} - /** * i915_driver_lastclose - clean up after all DRM clients have exited * @dev: DRM device @@ -2569,7 +2558,7 @@ static int intel_runtime_resume(struct device *kdev) .driver_features = DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_GEM | DRIVER_PRIME | DRIVER_RENDER | DRIVER_MODESET, - .open = i915_driver_open, + .open = i915_gem_open, .lastclose = i915_driver_lastclose, .preclose = i915_driver_preclose, .postclose = i915_driver_postclose,