Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2885f6ac authored by John Harrison's avatar John Harrison Committed by Daniel Vetter
Browse files

drm/i915: Corrected 'file_priv' to 'file' in 'i915_driver_preclose()' 



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.

Signed-off-by: default avatarJohn Harrison <John.C.Harrison@Intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent fabf6e51

drivers/gpu/drm/i915/i915_dma.c

+3 −3
Original line number Diff line number Diff line
@@ -1957,11 +1957,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);

}

drivers/gpu/drm/i915/i915_drv.h

+3 −3
Original line number Diff line number Diff line
@@ -2104,12 +2104,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,