Re: [PATCH] drm: remove unnecessary fault wrappers

[Sean Paul <seanpaul@chromium.org>]

On Mon, Jan 30, 2017 at 12:20:02PM -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.

Can we rename the drm_do_* functions to remove "do_" instead? I don't think it
adds anything and this seems like a good time to fix that.

Sean

> 
> Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com>
> ---
>  drivers/gpu/drm/drm_vm.c | 28 ++++------------------------
>  1 file changed, 4 insertions(+), 24 deletions(-)
> 
> diff --git a/drivers/gpu/drm/drm_vm.c b/drivers/gpu/drm/drm_vm.c
> index bae6e26..e677b11 100644
> --- a/drivers/gpu/drm/drm_vm.c
> +++ b/drivers/gpu/drm/drm_vm.c
> @@ -349,50 +349,30 @@ 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,
> +	.fault = drm_do_vm_fault,
>  	.open = drm_vm_open,
>  	.close = drm_vm_close,
>  };
>  
>  /** Shared virtual memory operations */
>  static const struct vm_operations_struct drm_vm_shm_ops = {
> -	.fault = drm_vm_shm_fault,
> +	.fault = drm_do_vm_shm_fault,
>  	.open = drm_vm_open,
>  	.close = drm_vm_shm_close,
>  };
>  
>  /** DMA virtual memory operations */
>  static const struct vm_operations_struct drm_vm_dma_ops = {
> -	.fault = drm_vm_dma_fault,
> +	.fault = drm_do_vm_dma_fault,
>  	.open = drm_vm_open,
>  	.close = drm_vm_close,
>  };
>  
>  /** Scatter-gather virtual memory operations */
>  static const struct vm_operations_struct drm_vm_sg_ops = {
> -	.fault = drm_vm_sg_fault,
> +	.fault = drm_do_vm_sg_fault,
>  	.open = drm_vm_open,
>  	.close = drm_vm_close,
>  };
> -- 
> 2.7.4

-- 
Sean Paul, Software Engineer, Google / Chromium OS