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, 9 insertions, 11 deletions

diff --git a/drivers/char/drm/drm_irq.c b/drivers/char/drm/drm_irq.c
index 2e75331fd83e..ae3053ce7b2c 100644
--- a/drivers/char/drm/drm_irq.c
+++ b/drivers/char/drm/drm_irq.c
@@ -120,8 +120,8 @@ static int drm_irq_install(drm_device_t * dev)
 
                 spin_lock_init(&dev->vbl_lock);
 
-                INIT_LIST_HEAD(&dev->vbl_sigs.head);
-                INIT_LIST_HEAD(&dev->vbl_sigs2.head);
+                INIT_LIST_HEAD(&dev->vbl_sigs);
+                INIT_LIST_HEAD(&dev->vbl_sigs2);
 
                 dev->vbl_pending = 0;
         }
@@ -292,7 +292,7 @@ int drm_wait_vblank(DRM_IOCTL_ARGS)
 
         if (flags & _DRM_VBLANK_SIGNAL) {
                 unsigned long irqflags;
-                drm_vbl_sig_t *vbl_sigs = (flags & _DRM_VBLANK_SECONDARY)
+                struct list_head *vbl_sigs = (flags & _DRM_VBLANK_SECONDARY)
                                       ? &dev->vbl_sigs2 : &dev->vbl_sigs;
                 drm_vbl_sig_t *vbl_sig;
 
@@ -302,7 +302,7 @@ int drm_wait_vblank(DRM_IOCTL_ARGS)
                  * for the same vblank sequence number; nothing to be done in
                  * that case
                  */
-                list_for_each_entry(vbl_sig, &vbl_sigs->head, head) {
+                list_for_each_entry(vbl_sig, vbl_sigs, head) {
                         if (vbl_sig->sequence == vblwait.request.sequence
                             && vbl_sig->info.si_signo == vblwait.request.signal
                             && vbl_sig->task == current) {
@@ -336,7 +336,7 @@ int drm_wait_vblank(DRM_IOCTL_ARGS)
 
                 spin_lock_irqsave(&dev->vbl_lock, irqflags);
 
-                list_add_tail((struct list_head *)vbl_sig, &vbl_sigs->head);
+                list_add_tail(&vbl_sig->head, vbl_sigs);
 
                 spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
 
@@ -379,20 +379,18 @@ void drm_vbl_send_signals(drm_device_t * dev)
         spin_lock_irqsave(&dev->vbl_lock, flags);
 
         for (i = 0; i < 2; i++) {
-                struct list_head *list, *tmp;
-                drm_vbl_sig_t *vbl_sig;
-                drm_vbl_sig_t *vbl_sigs = i ? &dev->vbl_sigs2 : &dev->vbl_sigs;
+                drm_vbl_sig_t *vbl_sig, *tmp;
+                struct list_head *vbl_sigs = i ? &dev->vbl_sigs2 : &dev->vbl_sigs;
                 unsigned int vbl_seq = atomic_read(i ? &dev->vbl_received2 :
                                                    &dev->vbl_received);
 
-                list_for_each_safe(list, tmp, &vbl_sigs->head) {
-                        vbl_sig = list_entry(list, drm_vbl_sig_t, head);
+                list_for_each_entry_safe(vbl_sig, tmp, vbl_sigs, head) {
                         if ((vbl_seq - vbl_sig->sequence) <= (1 << 23)) {
                                 vbl_sig->info.si_code = vbl_seq;
                                 send_sig_info(vbl_sig->info.si_signo,
                                               &vbl_sig->info, vbl_sig->task);
 
-                                list_del(list);
+                                list_del(&vbl_sig->head);
 
                                 drm_free(vbl_sig, sizeof(*vbl_sig),
                                          DRM_MEM_DRIVER);