diff options
author | John Harrison <John.C.Harrison@Intel.com> | 2014-06-26 13:23:52 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-07-07 14:00:44 -0400 |
commit | 2885f6ac070612f21d041f650a4d2bc44b02d6b6 (patch) | |
tree | 59dfc868b7b486c90b5c256e7e8af3385ca04a18 | |
parent | fabf6e513f640dac89645e1a98376eb8064394ee (diff) |
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: John Harrison <John.C.Harrison@Intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r-- | drivers/gpu/drm/i915/i915_dma.c | 6 | ||||
-rw-r--r-- | 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 5e583a1838f8..ce6918521699 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c | |||
@@ -1957,11 +1957,11 @@ void i915_driver_lastclose(struct drm_device *dev) | |||
1957 | i915_dma_cleanup(dev); | 1957 | i915_dma_cleanup(dev); |
1958 | } | 1958 | } |
1959 | 1959 | ||
1960 | void i915_driver_preclose(struct drm_device *dev, struct drm_file *file_priv) | 1960 | void i915_driver_preclose(struct drm_device *dev, struct drm_file *file) |
1961 | { | 1961 | { |
1962 | mutex_lock(&dev->struct_mutex); | 1962 | mutex_lock(&dev->struct_mutex); |
1963 | i915_gem_context_close(dev, file_priv); | 1963 | i915_gem_context_close(dev, file); |
1964 | i915_gem_release(dev, file_priv); | 1964 | i915_gem_release(dev, file); |
1965 | mutex_unlock(&dev->struct_mutex); | 1965 | mutex_unlock(&dev->struct_mutex); |
1966 | } | 1966 | } |
1967 | 1967 | ||
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index b560efc6eb35..204de4032a4a 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h | |||
@@ -2104,12 +2104,12 @@ void i915_update_dri1_breadcrumb(struct drm_device *dev); | |||
2104 | extern void i915_kernel_lost_context(struct drm_device * dev); | 2104 | extern void i915_kernel_lost_context(struct drm_device * dev); |
2105 | extern int i915_driver_load(struct drm_device *, unsigned long flags); | 2105 | extern int i915_driver_load(struct drm_device *, unsigned long flags); |
2106 | extern int i915_driver_unload(struct drm_device *); | 2106 | extern int i915_driver_unload(struct drm_device *); |
2107 | extern int i915_driver_open(struct drm_device *dev, struct drm_file *file_priv); | 2107 | extern int i915_driver_open(struct drm_device *dev, struct drm_file *file); |
2108 | extern void i915_driver_lastclose(struct drm_device * dev); | 2108 | extern void i915_driver_lastclose(struct drm_device * dev); |
2109 | extern void i915_driver_preclose(struct drm_device *dev, | 2109 | extern void i915_driver_preclose(struct drm_device *dev, |
2110 | struct drm_file *file_priv); | 2110 | struct drm_file *file); |
2111 | extern void i915_driver_postclose(struct drm_device *dev, | 2111 | extern void i915_driver_postclose(struct drm_device *dev, |
2112 | struct drm_file *file_priv); | 2112 | struct drm_file *file); |
2113 | extern int i915_driver_device_is_agp(struct drm_device * dev); | 2113 | extern int i915_driver_device_is_agp(struct drm_device * dev); |
2114 | #ifdef CONFIG_COMPAT | 2114 | #ifdef CONFIG_COMPAT |
2115 | extern long i915_compat_ioctl(struct file *filp, unsigned int cmd, | 2115 | extern long i915_compat_ioctl(struct file *filp, unsigned int cmd, |