Renamed list variables for clarity in event_list

1 files changed, 20 insertions, 21 deletions

diff --git a/litmus/event_group.c b/litmus/event_group.c
index 6811fa2cf9e9..f2ee9158294b 100644
--- a/litmus/event_group.c
+++ b/litmus/event_group.c
@@ -33,7 +33,7 @@ static enum hrtimer_restart on_timer(struct hrtimer *timer)
         unsigned long num = 0;
         struct event_list *el;
         struct rt_event *e;
-        struct list_head *pos, *safe, list;
+        struct list_head *pos, *safe, events;
 
         el = container_of(timer, struct event_list, timer);
 
@@ -42,17 +42,17 @@ static enum hrtimer_restart on_timer(struct hrtimer *timer)
 
         raw_spin_lock_irqsave(&el->group->queue_lock, flags);
         VTRACE("Removing event list 0x%p\n", el);
-        list_del_init(&el->list);
+        list_del_init(&el->queue_node);
         raw_spin_unlock_irqrestore(&el->group->queue_lock, flags);
 
         /* Empty event list so this event can be requeued */
         VTRACE("Emptying event list 0x%p\n", el);
-        list_replace_init(&el->events, &list);
+        list_replace_init(&el->events, &events);
 
         /* Fire events */
-        list_for_each_safe(pos, safe, &list) {
+        list_for_each_safe(pos, safe, &events) {
                 num++;
-                e = list_entry(pos, struct rt_event, list);
+                e = list_entry(pos, struct rt_event, events_node);
                 VTRACE("Dequeueing event 0x%p with prio %d from 0x%p\n",
                       e, e->prio, el);
                 list_del_init(pos);
@@ -71,22 +71,21 @@ void insert_event(struct event_list *el, struct rt_event *e)
         struct list_head *pos, *last = NULL;
         struct rt_event *queued;
         list_for_each(pos, &el->events) {
-                queued = list_entry(pos, struct rt_event, list);
+                queued = list_entry(pos, struct rt_event, events_node);
                 last = pos;
                 if (e->prio < queued->prio) {
                         VTRACE("Inserting priority %d event 0x%p before %d 0x%p "
                                "in 0x%p, pos 0x%p\n", e->prio, e,
-                               queued->prio, &queued->list, el, pos);
-                        BUG_ON(!list_empty(&e->list));
-                        list_add_tail(&e->list, pos);
+                               queued->prio, &queued->events_node, el, pos);
+                        BUG_ON(!list_empty(&e->events_node));
+                        list_add_tail(&e->events_node, pos);
                         return;
                 }
         }
         VTRACE("Inserting  priority %d event 0x%p at end of 0x%p, last 0x%p\n",
                e->prio, e, el, last);
-        BUG_ON(!list_empty(&e->list));
-        list_add(&e->list, (last) ? last : pos);
-        VTRACE("Singular? %d\n", list_is_singular(&el->events));
+        BUG_ON(!list_empty(&e->events_node));
+        list_add(&e->events_node, (last) ? last : pos);
 }
 
 /*
@@ -110,7 +109,7 @@ static struct event_list* get_event_list(struct event_group *group,
         pos = group->event_queue[slot].next;
         list_for_each(pos, &group->event_queue[slot]) {
                 BUG_ON(remaining-- < 0);
-                tmp = list_entry(pos, struct event_list, list);
+                tmp = list_entry(pos, struct event_list, queue_node);
                 if (lt_after_eq(fire, tmp->fire_time) &&
                     lt_before(fire, tmp->fire_time + group->res)) {
                         VTRACE("Found match 0x%p at time %llu\n",
@@ -137,8 +136,8 @@ static struct event_list* get_event_list(struct event_group *group,
                 /* Add to queue */
                 VTRACE("Using list 0x%p for priority %d and time %llu\n",
                        tmp, e->prio, fire);
-                BUG_ON(!list_empty(&tmp->list));
-                list_add(&tmp->list, pos->prev);
+                BUG_ON(!list_empty(&tmp->queue_node));
+                list_add(&tmp->queue_node, pos->prev);
                 el = tmp;
         }
         return el;
@@ -227,10 +226,10 @@ void cancel_event(struct rt_event *e)
                  * trigger the queued events.
                  */
                 if (!list_is_singular(&e->event_list->events)) {
-                        swap = list_entry(e->list.next, struct rt_event, list);
+                        swap = list_entry(e->events_node.next, struct rt_event,
+                                          events_node);
                         VTRACE("Swapping with event 0x%p of priority %d\n",
                                swap, swap->prio);
-
                         tmp = swap->event_list;
                         swap->event_list = e->event_list;
                         e->event_list = tmp;
@@ -239,11 +238,11 @@ void cancel_event(struct rt_event *e)
                 /* Disable the event_list */
                 atomic_set(&e->event_list->info.state, HRTIMER_START_ON_INACTIVE);
                 hrtimer_try_to_cancel(&e->event_list->timer);
-                list_del_init(&e->event_list->list);
+                list_del_init(&e->event_list->queue_node);
         } else {
                 VTRACE("List 0x%p is empty\n", e->event_list);
         }
-        list_del_init(&e->list);
+        list_del_init(&e->events_node);
         raw_spin_unlock(&group->queue_lock);
         e->_event_group = NULL;
 }
@@ -255,7 +254,7 @@ struct event_list* event_list_alloc(int gfp_flags)
         struct event_list *el = kmem_cache_alloc(event_list_cache, gfp_flags);
         if (el) {
                 hrtimer_init(&el->timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS);
-                INIT_LIST_HEAD(&el->list);
+                INIT_LIST_HEAD(&el->queue_node);
                 el->timer.function = on_timer;
         } else {
                 VTRACE("Failed to allocate event list!\n");
@@ -272,7 +271,7 @@ void init_event(struct rt_event *e, int prio, fire_event_t function,
         e->function = function;
         e->event_list = el;
         e->_event_group = NULL;
-        INIT_LIST_HEAD(&e->list);
+        INIT_LIST_HEAD(&e->events_node);
 }
 
 /**