From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754628AbdA3WJz (ORCPT ); Mon, 30 Jan 2017 17:09:55 -0500 Received: from mga06.intel.com ([134.134.136.31]:31668 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754549AbdA3WJx (ORCPT ); Mon, 30 Jan 2017 17:09:53 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,312,1477983600"; d="scan'208";a="1119909756" From: Ross Zwisler To: linux-kernel@vger.kernel.org Cc: Ross Zwisler , Daniel Vetter , David Airlie , Jani Nikula , Sean Paul , dri-devel@lists.freedesktop.org Subject: [PATCH v2] drm: remove unnecessary fault wrappers Date: Mon, 30 Jan 2017 15:09:39 -0700 Message-Id: <1485814179-28308-1-git-send-email-ross.zwisler@linux.intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <20170130203035.GS20076@art_vandelay> References: <20170130203035.GS20076@art_vandelay> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The fault wrappers drm_vm_fault(), drm_vm_shm_fault(), drm_vm_dma_fault() and drm_vm_sg_fault() used to provide extra logic beyond what was in the "drm_do_*" versions of these functions, but as of this commit: commit ca0b07d9a969 ("drm: convert drm from nopage to fault.") They are just unnecessary wrappers that do nothing. Remove them, and rename the the drm_do_* fault handlers to remove the "do_" since they no longer have corresponding wrappers. Signed-off-by: Ross Zwisler --- This patch applies cleanly to mmots/master, which is currently at v4.10-rc5-mmots-2017-01-26-15-49. --- drivers/gpu/drm/drm_vm.c | 30 +++++------------------------- 1 file changed, 5 insertions(+), 25 deletions(-) diff --git a/drivers/gpu/drm/drm_vm.c b/drivers/gpu/drm/drm_vm.c index 0cd993a..039a1e0 100644 --- a/drivers/gpu/drm/drm_vm.c +++ b/drivers/gpu/drm/drm_vm.c @@ -95,7 +95,7 @@ static pgprot_t drm_dma_prot(uint32_t map_type, struct vm_area_struct *vma) * map, get the page, increment the use count and return it. */ #if IS_ENABLED(CONFIG_AGP) -static int drm_do_vm_fault(struct vm_fault *vmf) +static int drm_vm_fault(struct vm_fault *vmf) { struct vm_area_struct *vma = vmf->vma; struct drm_file *priv = vma->vm_file->private_data; @@ -168,7 +168,7 @@ static int drm_do_vm_fault(struct vm_fault *vmf) return VM_FAULT_SIGBUS; /* Disallow mremap */ } #else -static int drm_do_vm_fault(struct vm_fault *vmf) +static int drm_vm_fault(struct vm_fault *vmf) { return VM_FAULT_SIGBUS; } @@ -183,7 +183,7 @@ static int drm_do_vm_fault(struct vm_fault *vmf) * Get the mapping, find the real physical page to map, get the page, and * return it. */ -static int drm_do_vm_shm_fault(struct vm_fault *vmf) +static int drm_vm_shm_fault(struct vm_fault *vmf) { struct vm_area_struct *vma = vmf->vma; struct drm_local_map *map = vma->vm_private_data; @@ -285,7 +285,7 @@ static void drm_vm_shm_close(struct vm_area_struct *vma) * * Determine the page number from the page offset and get it from drm_device_dma::pagelist. */ -static int drm_do_vm_dma_fault(struct vm_fault *vmf) +static int drm_vm_dma_fault(struct vm_fault *vmf) { struct vm_area_struct *vma = vmf->vma; struct drm_file *priv = vma->vm_file->private_data; @@ -320,7 +320,7 @@ static int drm_do_vm_dma_fault(struct vm_fault *vmf) * * Determine the map offset from the page offset and get it from drm_sg_mem::pagelist. */ -static int drm_do_vm_sg_fault(struct vm_fault *vmf) +static int drm_vm_sg_fault(struct vm_fault *vmf) { struct vm_area_struct *vma = vmf->vma; struct drm_local_map *map = vma->vm_private_data; @@ -347,26 +347,6 @@ static int drm_do_vm_sg_fault(struct vm_fault *vmf) return 0; } -static int drm_vm_fault(struct vm_fault *vmf) -{ - return drm_do_vm_fault(vmf); -} - -static int drm_vm_shm_fault(struct vm_fault *vmf) -{ - return drm_do_vm_shm_fault(vmf); -} - -static int drm_vm_dma_fault(struct vm_fault *vmf) -{ - return drm_do_vm_dma_fault(vmf); -} - -static int drm_vm_sg_fault(struct vm_fault *vmf) -{ - return drm_do_vm_sg_fault(vmf); -} - /** AGP virtual memory operations */ static const struct vm_operations_struct drm_vm_ops = { .fault = drm_vm_fault, -- 2.7.4