drm/virtio: use consistent names for drm_files

Minor cleanup, change:

- file_priv--> file,
- drm_file --> file.

Reviewed-by: Chia-I Wu <olvaffe@gmail.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Signed-off-by: Gurchetan Singh <gurchetansingh@chromium.org>
Link: http://patchwork.freedesktop.org/patch/msgid/20200225000800.2966-1-gurchetansingh@chromium.org
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

diff --git a/drivers/gpu/drm/virtio/virtgpu_ioctl.c b/drivers/gpu/drm/virtio/virtgpu_ioctl.c
index bbc31ae..baad7e1 100644 (file)
--- a/drivers/gpu/drm/virtio/virtgpu_ioctl.c
+++ b/drivers/gpu/drm/virtio/virtgpu_ioctl.c
@@ -34,12 +34,12 @@
 #include "virtgpu_drv.h"
 
 static int virtio_gpu_map_ioctl(struct drm_device *dev, void *data,
-                               struct drm_file *file_priv)
+                               struct drm_file *file)
 {
        struct virtio_gpu_device *vgdev = dev->dev_private;
        struct drm_virtgpu_map *virtio_gpu_map = data;
 
-       return virtio_gpu_mode_dumb_mmap(file_priv, vgdev->ddev,
+       return virtio_gpu_mode_dumb_mmap(file, vgdev->ddev,
                                         virtio_gpu_map->handle,
                                         &virtio_gpu_map->offset);
 }
@@ -51,11 +51,11 @@ static int virtio_gpu_map_ioctl(struct drm_device *dev, void *data,
  * VIRTIO_GPUReleaseInfo struct (first XXX bytes)
  */
 static int virtio_gpu_execbuffer_ioctl(struct drm_device *dev, void *data,
-                                struct drm_file *drm_file)
+                                struct drm_file *file)
 {
        struct drm_virtgpu_execbuffer *exbuf = data;
        struct virtio_gpu_device *vgdev = dev->dev_private;
-       struct virtio_gpu_fpriv *vfpriv = drm_file->driver_priv;
+       struct virtio_gpu_fpriv *vfpriv = file->driver_priv;
        struct virtio_gpu_fence *out_fence;
        int ret;
        uint32_t *bo_handles = NULL;
@@ -116,7 +116,7 @@ static int virtio_gpu_execbuffer_ioctl(struct drm_device *dev, void *data,
                        goto out_unused_fd;
                }
 
-               buflist = virtio_gpu_array_from_handles(drm_file, bo_handles,
+               buflist = virtio_gpu_array_from_handles(file, bo_handles,
                                                        exbuf->num_bo_handles);
                if (!buflist) {
                        ret = -ENOENT;
@@ -178,7 +178,7 @@ out_unused_fd:
 }
 
 static int virtio_gpu_getparam_ioctl(struct drm_device *dev, void *data,
-                                    struct drm_file *file_priv)
+                                    struct drm_file *file)
 {
        struct virtio_gpu_device *vgdev = dev->dev_private;
        struct drm_virtgpu_getparam *param = data;
@@ -201,7 +201,7 @@ static int virtio_gpu_getparam_ioctl(struct drm_device *dev, void *data,
 }
 
 static int virtio_gpu_resource_create_ioctl(struct drm_device *dev, void *data,
-                                           struct drm_file *file_priv)
+                                           struct drm_file *file)
 {
        struct virtio_gpu_device *vgdev = dev->dev_private;
        struct drm_virtgpu_resource_create *rc = data;
@@ -252,7 +252,7 @@ static int virtio_gpu_resource_create_ioctl(struct drm_device *dev, void *data,
                return ret;
        obj = &qobj->base.base;
 
-       ret = drm_gem_handle_create(file_priv, obj, &handle);
+       ret = drm_gem_handle_create(file, obj, &handle);
        if (ret) {
                drm_gem_object_release(obj);
                return ret;
@@ -265,13 +265,13 @@ static int virtio_gpu_resource_create_ioctl(struct drm_device *dev, void *data,
 }
 
 static int virtio_gpu_resource_info_ioctl(struct drm_device *dev, void *data,
-                                         struct drm_file *file_priv)
+                                         struct drm_file *file)
 {
        struct drm_virtgpu_resource_info *ri = data;
        struct drm_gem_object *gobj = NULL;
        struct virtio_gpu_object *qobj = NULL;
 
-       gobj = drm_gem_object_lookup(file_priv, ri->bo_handle);
+       gobj = drm_gem_object_lookup(file, ri->bo_handle);
        if (gobj == NULL)
                return -ENOENT;