drm: cleanup use of Linux list handling macros

This makes the drms use of the list handling macros a lot cleaner
and more along the lines of how they should be used and uses them
in some more places.

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

1 files changed, 12 insertions, 20 deletions

diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h
index d494315752a2..22779582ee5b 100644
--- a/drivers/char/drm/drmP.h
+++ b/drivers/char/drm/drmP.h
@@ -279,20 +279,15 @@ typedef struct drm_devstate {
 } drm_devstate_t;
 
 typedef struct drm_magic_entry {
-        drm_hash_item_t hash_item;
         struct list_head head;
+        drm_hash_item_t hash_item;
         struct drm_file *priv;
         struct drm_magic_entry *next;
 } drm_magic_entry_t;
 
-typedef struct drm_magic_head {
-        struct drm_magic_entry *head;
-        struct drm_magic_entry *tail;
-} drm_magic_head_t;
-
 typedef struct drm_vma_entry {
+        struct list_head head;
         struct vm_area_struct *vma;
-        struct drm_vma_entry *next;
         pid_t pid;
 } drm_vma_entry_t;
 
@@ -379,8 +374,7 @@ typedef struct drm_file {
         uid_t uid;
         drm_magic_t magic;
         unsigned long ioctl_count;
-        struct drm_file *next;
-        struct drm_file *prev;
+        struct list_head lhead;
         struct drm_head *head;
         int remove_auth_on_close;
         unsigned long lock_count;
@@ -449,8 +443,7 @@ typedef struct drm_agp_mem {
         DRM_AGP_MEM *memory;
         unsigned long bound;            /**< address */
         int pages;
-        struct drm_agp_mem *prev;       /**< previous entry */
-        struct drm_agp_mem *next;       /**< next entry */
+        struct list_head head;
 } drm_agp_mem_t;
 
 /**
@@ -460,7 +453,7 @@ typedef struct drm_agp_mem {
  */
 typedef struct drm_agp_head {
         DRM_AGP_KERN agp_info;          /**< AGP device information */
-        drm_agp_mem_t *memory;          /**< memory entries */
+        struct list_head memory;
         unsigned long mode;             /**< AGP mode */
         struct agp_bridge_data *bridge;
         int enabled;                    /**< whether the AGP bus as been enabled */
@@ -669,28 +662,27 @@ typedef struct drm_device {
 
         /** \name Authentication */
         /*@{ */
-        drm_file_t *file_first;         /**< file list head */
-        drm_file_t *file_last;          /**< file list tail */
+        struct list_head filelist;
         drm_open_hash_t magiclist;      /**< magic hash table */
         struct list_head magicfree;
         /*@} */
 
         /** \name Memory management */
         /*@{ */
-        drm_map_list_t *maplist;        /**< Linked list of regions */
+        struct list_head maplist;       /**< Linked list of regions */
         int map_count;                  /**< Number of mappable regions */
         drm_open_hash_t map_hash;       /**< User token hash table for maps */
 
         /** \name Context handle management */
         /*@{ */
-        drm_ctx_list_t *ctxlist;        /**< Linked list of context handles */
+        struct list_head ctxlist;       /**< Linked list of context handles */
         int ctx_count;                  /**< Number of context handles */
         struct mutex ctxlist_mutex;     /**< For ctxlist */
 
         drm_map_t **context_sareas;         /**< per-context SAREA's */
         int max_context;
 
-        drm_vma_entry_t *vmalist;       /**< List of vmas (for debugging) */
+        struct list_head vmalist;       /**< List of vmas (for debugging) */
         drm_lock_data_t lock;           /**< Information on hardware lock */
         /*@} */
 
@@ -725,8 +717,8 @@ typedef struct drm_device {
         atomic_t vbl_received;
         atomic_t vbl_received2;         /**< number of secondary VBLANK interrupts */
         spinlock_t vbl_lock;
-        drm_vbl_sig_t vbl_sigs;         /**< signal list to send on VBLANK */
-        drm_vbl_sig_t vbl_sigs2;        /**< signals to send on secondary VBLANK */
+        struct list_head vbl_sigs;              /**< signal list to send on VBLANK */
+        struct list_head vbl_sigs2;     /**< signals to send on secondary VBLANK */
         unsigned int vbl_pending;
         spinlock_t tasklet_lock;        /**< For drm_locked_tasklet */
         void (*locked_tasklet_func)(struct drm_device *dev);
@@ -1089,7 +1081,7 @@ static __inline__ struct drm_map *drm_core_findmap(struct drm_device *dev,
                                                    unsigned int token)
 {
         drm_map_list_t *_entry;
-        list_for_each_entry(_entry, &dev->maplist->head, head)
+        list_for_each_entry(_entry, &dev->maplist, head)
             if (_entry->user_token == token)
                 return _entry->map;
         return NULL;