[Intel-gfx] [RFC 01/44] drm/i915: Corrected 'file_priv' to 'file' in 'i915_driver_preclose()'

[Jesse Barnes]

On Thu, 26 Jun 2014 18:23:52 +0100
John.C.Harrison at Intel.com wrote:

> From: John Harrison <John.C.Harrison at Intel.com>
> 
> The 'i915_driver_preclose()' function has a parameter called 'file_priv'.
> However, this is misleading as the structure it points to is a 'drm_file' not a
> 'drm_i915_file_private'. It should be named just 'file' to avoid confusion.
> ---
>  drivers/gpu/drm/i915/i915_dma.c |    6 +++---
>  drivers/gpu/drm/i915/i915_drv.h |    6 +++---
>  2 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
> index b9159ad..6cce55b 100644
> --- a/drivers/gpu/drm/i915/i915_dma.c
> +++ b/drivers/gpu/drm/i915/i915_dma.c
> @@ -1916,11 +1916,11 @@ void i915_driver_lastclose(struct drm_device * dev)
>  	i915_dma_cleanup(dev);
>  }
>  
> -void i915_driver_preclose(struct drm_device * dev, struct drm_file *file_priv)
> +void i915_driver_preclose(struct drm_device *dev, struct drm_file *file)
>  {
>  	mutex_lock(&dev->struct_mutex);
> -	i915_gem_context_close(dev, file_priv);
> -	i915_gem_release(dev, file_priv);
> +	i915_gem_context_close(dev, file);
> +	i915_gem_release(dev, file);
>  	mutex_unlock(&dev->struct_mutex);
>  }
>  
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index bea9ab40..7a96ca0 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -2044,12 +2044,12 @@ void i915_update_dri1_breadcrumb(struct drm_device *dev);
>  extern void i915_kernel_lost_context(struct drm_device * dev);
>  extern int i915_driver_load(struct drm_device *, unsigned long flags);
>  extern int i915_driver_unload(struct drm_device *);
> -extern int i915_driver_open(struct drm_device *dev, struct drm_file *file_priv);
> +extern int i915_driver_open(struct drm_device *dev, struct drm_file *file);
>  extern void i915_driver_lastclose(struct drm_device * dev);
>  extern void i915_driver_preclose(struct drm_device *dev,
> -				 struct drm_file *file_priv);
> +				 struct drm_file *file);
>  extern void i915_driver_postclose(struct drm_device *dev,
> -				  struct drm_file *file_priv);
> +				  struct drm_file *file);
>  extern int i915_driver_device_is_agp(struct drm_device * dev);
>  #ifdef CONFIG_COMPAT
>  extern long i915_compat_ioctl(struct file *filp, unsigned int cmd,

Reviewed-by: Jesse Barnes <jbarnes at virtuousgeek.org>

-- 
Jesse Barnes, Intel Open Source Technology Center