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: 76217 Delivered-To: patch@linaro.org Received: by 10.140.106.72 with SMTP id d66csp1910266qgf; Wed, 14 Sep 2016 07:40:33 -0700 (PDT) X-Received: by 10.98.73.22 with SMTP id w22mr5169035pfa.62.1473864033408; Wed, 14 Sep 2016 07:40:33 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y64si5546520pfg.99.2016.09.14.07.40.33; Wed, 14 Sep 2016 07:40:33 -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 S1755686AbcINOkb (ORCPT + 27 others); Wed, 14 Sep 2016 10:40:31 -0400 Received: from conuserg-08.nifty.com ([210.131.2.75]:49477 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761936AbcINOk3 (ORCPT ); Wed, 14 Sep 2016 10:40:29 -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 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 Cc: Christian K?nig , Jani Nikula , Alexander Deucher , Masahiro Yamada , Daniel Vetter , intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.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> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(-) -- 1.9.1 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,