On Mon, Jan 30, 2017 at 03:09:39PM -0700, Ross Zwisler wrote: > 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. > Thanks for humoring my nit :-) Reviewed-by: Sean Paul <seanpaul@xxxxxxxxxxxx> > Signed-off-by: Ross Zwisler <ross.zwisler@xxxxxxxxxxxxxxx> > --- > > 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 -- Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel