drm: remove drm_file_t, drm_device_t and drm_head_t typedefs

some drivers still todo.

Signed-off-by: Dave Airlie <airlied@linux.ie>

1 files changed, 20 insertions, 20 deletions

diff --git a/drivers/char/drm/drm_vm.c b/drivers/char/drm/drm_vm.c
index 13bdb1393c36..f90ef788eed0 100644
--- a/drivers/char/drm/drm_vm.c
+++ b/drivers/char/drm/drm_vm.c
@@ -79,8 +79,8 @@ static pgprot_t drm_io_prot(uint32_t map_type, struct vm_area_struct *vma)
 static __inline__ struct page *drm_do_vm_nopage(struct vm_area_struct *vma,
                                                 unsigned long address)
 {
-        drm_file_t *priv = vma->vm_file->private_data;
-        drm_device_t *dev = priv->head->dev;
+        struct drm_file *priv = vma->vm_file->private_data;
+        struct drm_device *dev = priv->head->dev;
         struct drm_map *map = NULL;
         drm_map_list_t *r_list;
         drm_hash_item_t *hash;
@@ -194,8 +194,8 @@ static __inline__ struct page *drm_do_vm_shm_nopage(struct vm_area_struct *vma,
  */
 static void drm_vm_shm_close(struct vm_area_struct *vma)
 {
-        drm_file_t *priv = vma->vm_file->private_data;
-        drm_device_t *dev = priv->head->dev;
+        struct drm_file *priv = vma->vm_file->private_data;
+        struct drm_device *dev = priv->head->dev;
         drm_vma_entry_t *pt, *temp;
         struct drm_map *map;
         drm_map_list_t *r_list;
@@ -274,8 +274,8 @@ static void drm_vm_shm_close(struct vm_area_struct *vma)
 static __inline__ struct page *drm_do_vm_dma_nopage(struct vm_area_struct *vma,
                                                     unsigned long address)
 {
-        drm_file_t *priv = vma->vm_file->private_data;
-        drm_device_t *dev = priv->head->dev;
+        struct drm_file *priv = vma->vm_file->private_data;
+        struct drm_device *dev = priv->head->dev;
         drm_device_dma_t *dma = dev->dma;
         unsigned long offset;
         unsigned long page_nr;
@@ -311,8 +311,8 @@ static __inline__ struct page *drm_do_vm_sg_nopage(struct vm_area_struct *vma,
                                                    unsigned long address)
 {
         struct drm_map *map = (struct drm_map *) vma->vm_private_data;
-        drm_file_t *priv = vma->vm_file->private_data;
-        drm_device_t *dev = priv->head->dev;
+        struct drm_file *priv = vma->vm_file->private_data;
+        struct drm_device *dev = priv->head->dev;
         drm_sg_mem_t *entry = dev->sg;
         unsigned long offset;
         unsigned long map_offset;
@@ -405,8 +405,8 @@ static struct vm_operations_struct drm_vm_sg_ops = {
  */
 static void drm_vm_open_locked(struct vm_area_struct *vma)
 {
-        drm_file_t *priv = vma->vm_file->private_data;
-        drm_device_t *dev = priv->head->dev;
+        struct drm_file *priv = vma->vm_file->private_data;
+        struct drm_device *dev = priv->head->dev;
         drm_vma_entry_t *vma_entry;
 
         DRM_DEBUG("0x%08lx,0x%08lx\n",
@@ -423,8 +423,8 @@ static void drm_vm_open_locked(struct vm_area_struct *vma)
 
 static void drm_vm_open(struct vm_area_struct *vma)
 {
-        drm_file_t *priv = vma->vm_file->private_data;
-        drm_device_t *dev = priv->head->dev;
+        struct drm_file *priv = vma->vm_file->private_data;
+        struct drm_device *dev = priv->head->dev;
 
         mutex_lock(&dev->struct_mutex);
         drm_vm_open_locked(vma);
@@ -441,8 +441,8 @@ static void drm_vm_open(struct vm_area_struct *vma)
  */
 static void drm_vm_close(struct vm_area_struct *vma)
 {
-        drm_file_t *priv = vma->vm_file->private_data;
-        drm_device_t *dev = priv->head->dev;
+        struct drm_file *priv = vma->vm_file->private_data;
+        struct drm_device *dev = priv->head->dev;
         drm_vma_entry_t *pt, *temp;
 
         DRM_DEBUG("0x%08lx,0x%08lx\n",
@@ -472,8 +472,8 @@ static void drm_vm_close(struct vm_area_struct *vma)
  */
 static int drm_mmap_dma(struct file *filp, struct vm_area_struct *vma)
 {
-        drm_file_t *priv = filp->private_data;
-        drm_device_t *dev;
+        struct drm_file *priv = filp->private_data;
+        struct drm_device *dev;
         drm_device_dma_t *dma;
         unsigned long length = vma->vm_end - vma->vm_start;
 
@@ -545,8 +545,8 @@ EXPORT_SYMBOL(drm_core_get_reg_ofs);
  */
 static int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma)
 {
-        drm_file_t *priv = filp->private_data;
-        drm_device_t *dev = priv->head->dev;
+        struct drm_file *priv = filp->private_data;
+        struct drm_device *dev = priv->head->dev;
         struct drm_map *map = NULL;
         unsigned long offset = 0;
         drm_hash_item_t *hash;
@@ -663,8 +663,8 @@ static int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma)
 
 int drm_mmap(struct file *filp, struct vm_area_struct *vma)
 {
-        drm_file_t *priv = filp->private_data;
-        drm_device_t *dev = priv->head->dev;
+        struct drm_file *priv = filp->private_data;
+        struct drm_device *dev = priv->head->dev;
         int ret;
 
         mutex_lock(&dev->struct_mutex);