1 files changed, 22 insertions, 46 deletions

diff --git a/drivers/char/drm/drm_fops.c b/drivers/char/drm/drm_fops.c
index 3b159cab3bc8..7bc51bac450d 100644
--- a/drivers/char/drm/drm_fops.c
+++ b/drivers/char/drm/drm_fops.c
@@ -39,9 +39,9 @@
 #include <linux/poll.h>
 
 static int drm_open_helper(struct inode *inode, struct file *filp,
-                           drm_device_t * dev);
+                           struct drm_device * dev);
 
-static int drm_setup(drm_device_t * dev)
+static int drm_setup(struct drm_device * dev)
 {
         drm_local_map_t *map;
         int i;
@@ -79,13 +79,6 @@ static int drm_setup(drm_device_t * dev)
         drm_ht_create(&dev->magiclist, DRM_MAGIC_HASH_ORDER);
         INIT_LIST_HEAD(&dev->magicfree);
 
-        dev->ctxlist = drm_alloc(sizeof(*dev->ctxlist), DRM_MEM_CTXLIST);
-        if (dev->ctxlist == NULL)
-                return -ENOMEM;
-        memset(dev->ctxlist, 0, sizeof(*dev->ctxlist));
-        INIT_LIST_HEAD(&dev->ctxlist->head);
-
-        dev->vmalist = NULL;
         dev->sigdata.lock = NULL;
         init_waitqueue_head(&dev->lock.lock_queue);
         dev->queue_count = 0;
@@ -135,7 +128,7 @@ static int drm_setup(drm_device_t * dev)
  */
 int drm_open(struct inode *inode, struct file *filp)
 {
-        drm_device_t *dev = NULL;
+        struct drm_device *dev = NULL;
         int minor = iminor(inode);
         int retcode = 0;
 
@@ -174,7 +167,7 @@ EXPORT_SYMBOL(drm_open);
  */
 int drm_stub_open(struct inode *inode, struct file *filp)
 {
-        drm_device_t *dev = NULL;
+        struct drm_device *dev = NULL;
         int minor = iminor(inode);
         int err = -ENODEV;
         const struct file_operations *old_fops;
@@ -230,10 +223,10 @@ static int drm_cpu_valid(void)
  * filp and add it into the double linked list in \p dev.
  */
 static int drm_open_helper(struct inode *inode, struct file *filp,
-                           drm_device_t * dev)
+                           struct drm_device * dev)
 {
         int minor = iminor(inode);
-        drm_file_t *priv;
+        struct drm_file *priv;
         int ret;
 
         if (filp->f_flags & O_EXCL)
@@ -258,6 +251,8 @@ static int drm_open_helper(struct inode *inode, struct file *filp,
         priv->authenticated = capable(CAP_SYS_ADMIN);
         priv->lock_count = 0;
 
+        INIT_LIST_HEAD(&priv->lhead);
+
         if (dev->driver->open) {
                 ret = dev->driver->open(dev, priv);
                 if (ret < 0)
@@ -265,19 +260,10 @@ static int drm_open_helper(struct inode *inode, struct file *filp,
         }
 
         mutex_lock(&dev->struct_mutex);
-        if (!dev->file_last) {
-                priv->next = NULL;
-                priv->prev = NULL;
-                dev->file_first = priv;
-                dev->file_last = priv;
-                /* first opener automatically becomes master */
+        if (list_empty(&dev->filelist))
                 priv->master = 1;
-        } else {
-                priv->next = NULL;
-                priv->prev = dev->file_last;
-                dev->file_last->next = priv;
-                dev->file_last = priv;
-        }
+
+        list_add(&priv->lhead, &dev->filelist);
         mutex_unlock(&dev->struct_mutex);
 
 #ifdef __alpha__
@@ -309,8 +295,8 @@ static int drm_open_helper(struct inode *inode, struct file *filp,
 /** No-op. */
 int drm_fasync(int fd, struct file *filp, int on)
 {
-        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 retcode;
 
         DRM_DEBUG("fd = %d, device = 0x%lx\n", fd,
@@ -336,8 +322,8 @@ EXPORT_SYMBOL(drm_fasync);
  */
 int drm_release(struct inode *inode, struct file *filp)
 {
-        drm_file_t *priv = filp->private_data;
-        drm_device_t *dev;
+        struct drm_file *priv = filp->private_data;
+        struct drm_device *dev;
         int retcode = 0;
 
         lock_kernel();
@@ -414,10 +400,10 @@ int drm_release(struct inode *inode, struct file *filp)
         drm_fasync(-1, filp, 0);
 
         mutex_lock(&dev->ctxlist_mutex);
-        if (dev->ctxlist && (!list_empty(&dev->ctxlist->head))) {
-                drm_ctx_list_t *pos, *n;
+        if (!list_empty(&dev->ctxlist)) {
+                struct drm_ctx_list *pos, *n;
 
-                list_for_each_entry_safe(pos, n, &dev->ctxlist->head, head) {
+                list_for_each_entry_safe(pos, n, &dev->ctxlist, head) {
                         if (pos->tag == priv &&
                             pos->handle != DRM_KERNEL_CONTEXT) {
                                 if (dev->driver->context_dtor)
@@ -436,22 +422,12 @@ int drm_release(struct inode *inode, struct file *filp)
 
         mutex_lock(&dev->struct_mutex);
         if (priv->remove_auth_on_close == 1) {
-                drm_file_t *temp = dev->file_first;
-                while (temp) {
+                struct drm_file *temp;
+
+                list_for_each_entry(temp, &dev->filelist, lhead)
                         temp->authenticated = 0;
-                        temp = temp->next;
-                }
-        }
-        if (priv->prev) {
-                priv->prev->next = priv->next;
-        } else {
-                dev->file_first = priv->next;
-        }
-        if (priv->next) {
-                priv->next->prev = priv->prev;
-        } else {
-                dev->file_last = priv->prev;
         }
+        list_del(&priv->lhead);
         mutex_unlock(&dev->struct_mutex);
 
         if (dev->driver->postclose)