libdvr: Fix libdvr typos, part 3 [1/1]

PD#SWPL-90206

Problem:
Need to fix libdvr typos on Android S/T

Solution:
Fixed typos mentioned in SWPL-89633's typo result list

Verify:
Locally tested OK in AH212 RDK environment.

Signed-off-by: Wentao.MA <wentao.ma@amlogic.com>
Change-Id: I1c0b41116ed56bb8edb507b25e80046c2b2b5f25
diff --git a/include/list.h b/include/list.h
index 89230e7..0a1edae 100644
--- a/include/list.h
+++ b/include/list.h
@@ -42,13 +42,13 @@
  *
  * Some of the internal functions ("__xxx") are useful when
  * manipulating whole lists rather than single entries, as
- * sometimes we already know the cnext/cprev entries and we can
+ * sometimes we already know the c_next/c_prev entries and we can
  * generate better code by using them directly rather than
  * using the generic single-entry routines.
  */
 
 struct list_head {
-    struct list_head *cnext, *cprev;
+    struct list_head *c_next, *c_prev;
 };
 
 #define LIST_HEAD_INIT(name) { &(name), &(name) }
@@ -58,70 +58,70 @@
 
 static inline void INIT_LIST_HEAD(struct list_head *list)
 {
-    list->cnext = list;
-    list->cprev = list;
+    list->c_next = list;
+    list->c_prev = list;
 }
 
 /*
- * Insert a cnew entry between two known consecutive entries.
+ * Insert a c_new entry between two known consecutive entries.
  *
  * This is only for internal list manipulation where we know
- * the cprev/cnext entries already!
+ * the c_prev/c_next entries already!
  */
 #ifndef CONFIG_DEBUG_LIST
-static inline void __list_add(struct list_head *cnew,
-                  struct list_head *cprev,
-                  struct list_head *cnext)
+static inline void __list_add(struct list_head *c_new,
+                  struct list_head *c_prev,
+                  struct list_head *c_next)
 {
-    cnext->cprev = cnew;
-    cnew->cnext = cnext;
-    cnew->cprev = cprev;
-    cprev->cnext = cnew;
+    c_next->c_prev = c_new;
+    c_new->c_next = c_next;
+    c_new->c_prev = c_prev;
+    c_prev->c_next = c_new;
 }
 #else
-extern void __list_add(struct list_head *cnew,
+extern void __list_add(struct list_head *c_new,
                   struct list_head *prev,
                   struct list_head *next);
 #endif
 
 /**
- * list_add - add a cnew entry
- * @cnew: cnew entry to be added
+ * list_add - add a c_new entry
+ * @c_new: c_new entry to be added
  * @head: list head to add it after
  *
- * Insert a cnew entry after the specified head.
+ * Insert a c_new entry after the specified head.
  * This is good for implementing stacks.
  */
-static inline void list_add(struct list_head *cnew, struct list_head *head)
+static inline void list_add(struct list_head *c_new, struct list_head *head)
 {
-    __list_add(cnew, head, head->cnext);
+    __list_add(c_new, head, head->c_next);
 }
 
 
 /**
- * list_add_tail - add a cnew entry
- * @cnew: cnew entry to be added
+ * list_add_tail - add a c_new entry
+ * @c_new: c_new entry to be added
  * @head: list head to add it before
  *
- * Insert a cnew entry before the specified head.
+ * Insert a c_new entry before the specified head.
  * This is useful for implementing queues.
  */
-static inline void list_add_tail(struct list_head *cnew, struct list_head *head)
+static inline void list_add_tail(struct list_head *c_new, struct list_head *head)
 {
-    __list_add(cnew, head->cprev, head);
+    __list_add(c_new, head->c_prev, head);
 }
 
 /*
- * Delete a list entry by making the cprev/cnext entries
+ * Delete a list entry by making the c_prev/c_next entries
  * point to each other.
  *
  * This is only for internal list manipulation where we know
- * the cprev/cnext entries already!
+ * the c_prev/c_next entries already!
  */
-static inline void __list_del(struct list_head * cprev, struct list_head * cnext)
+static inline void __list_del(struct list_head * c_prev, struct list_head * c_next)
 {
-    cnext->cprev = cprev;
-    cprev->cnext = cnext;
+    c_next->c_prev = c_prev;
+    c_prev->c_next = c_next;
 }
 
 /**
@@ -133,34 +133,34 @@
 #ifndef CONFIG_DEBUG_LIST
 static inline void list_del(struct list_head *entry)
 {
-    __list_del(entry->cprev, entry->cnext);
-    entry->cnext = (struct list_head *)LIST_POISON1;
-    entry->cprev = (struct list_head *)LIST_POISON2;
+    __list_del(entry->c_prev, entry->c_next);
+    entry->c_next = (struct list_head *)LIST_POISON1;
+    entry->c_prev = (struct list_head *)LIST_POISON2;
 }
 #else
 extern void list_del(struct list_head *entry);
 #endif
 
 /**
- * list_replace - replace old entry by cnew one
+ * list_replace - replace old entry by c_new one
  * @old : the element to be replaced
- * @cnew : the cnew element to insert
+ * @c_new : the c_new element to insert
  *
  * If @old was empty, it will be overwritten.
  */
 static inline void list_replace(struct list_head *old,
-                struct list_head *cnew)
+                struct list_head *c_new)
 {
-    cnew->cnext = old->cnext;
-    cnew->cnext->cprev = cnew;
-    cnew->cprev = old->cprev;
-    cnew->cprev->cnext = cnew;
+    c_new->c_next = old->c_next;
+    c_new->c_next->c_prev = c_new;
+    c_new->c_prev = old->c_prev;
+    c_new->c_prev->c_next = c_new;
 }
 
 static inline void list_replace_init(struct list_head *old,
-                    struct list_head *cnew)
+                    struct list_head *c_new)
 {
-    list_replace(old, cnew);
+    list_replace(old, c_new);
     INIT_LIST_HEAD(old);
 }
 
@@ -170,7 +170,7 @@
  */
 static inline void list_del_init(struct list_head *entry)
 {
-    __list_del(entry->cprev, entry->cnext);
+    __list_del(entry->c_prev, entry->c_next);
     INIT_LIST_HEAD(entry);
 }
 
@@ -181,7 +181,7 @@
  */
 static inline void list_move(struct list_head *list, struct list_head *head)
 {
-    __list_del(list->cprev, list->cnext);
+    __list_del(list->c_prev, list->c_next);
     list_add(list, head);
 }
 
@@ -193,7 +193,7 @@
 static inline void list_move_tail(struct list_head *list,
                   struct list_head *head)
 {
-    __list_del(list->cprev, list->cnext);
+    __list_del(list->c_prev, list->c_next);
     list_add_tail(list, head);
 }
 
@@ -205,7 +205,7 @@
 static inline int list_is_last(const struct list_head *list,
                 const struct list_head *head)
 {
-    return list->cnext == head;
+    return list->c_next == head;
 }
 
 /**
@@ -214,7 +214,7 @@
  */
 static inline int list_empty(const struct list_head *head)
 {
-    return head->cnext == head;
+    return head->c_next == head;
 }
 
 /**
@@ -223,7 +223,7 @@
  *
  * Description:
  * tests whether a list is empty _and_ checks that no other CPU might be
- * in the process of modifying either member (cnext or cprev)
+ * in the process of modifying either member (c_next or c_prev)
  *
  * NOTE: using list_empty_careful() without synchronization
  * can only be safe if the only activity that can happen
@@ -232,8 +232,8 @@
  */
 static inline int list_empty_careful(const struct list_head *head)
 {
-    struct list_head *cnext = head->cnext;
-    return (cnext == head) && (cnext == head->cprev);
+    struct list_head *c_next = head->c_next;
+    return (c_next == head) && (c_next == head->c_prev);
 }
 
 /**
@@ -245,7 +245,7 @@
     struct list_head *first;
 
     if (!list_empty(head)) {
-        first = head->cnext;
+        first = head->c_next;
         list_move_tail(first, head);
     }
 }
@@ -256,24 +256,24 @@
  */
 static inline int list_is_singular(const struct list_head *head)
 {
-    return !list_empty(head) && (head->cnext == head->cprev);
+    return !list_empty(head) && (head->c_next == head->c_prev);
 }
 
 static inline void __list_cut_position(struct list_head *list,
         struct list_head *head, struct list_head *entry)
 {
-    struct list_head *cnew_first = entry->cnext;
-    list->cnext = head->cnext;
-    list->cnext->cprev = list;
-    list->cprev = entry;
-    entry->cnext = list;
-    head->cnext = cnew_first;
-    cnew_first->cprev = head;
+    struct list_head *c_new_first = entry->c_next;
+    list->c_next = head->c_next;
+    list->c_next->c_prev = list;
+    list->c_prev = entry;
+    entry->c_next = list;
+    head->c_next = c_new_first;
+    c_new_first->c_prev = head;
 }
 
 /**
  * list_cut_position - cut a list into two
- * @list: a cnew list to add all removed entries
+ * @list: a c_new list to add all removed entries
  * @head: a list with entries
  * @entry: an entry within head, could be the head itself
  *    and if so we won't cut the list
@@ -291,7 +291,7 @@
     if (list_empty(head))
         return;
     if (list_is_singular(head) &&
-        (head->cnext != entry && head != entry))
+        (head->c_next != entry && head != entry))
         return;
     if (entry == head)
         INIT_LIST_HEAD(list);
@@ -300,46 +300,46 @@
 }
 
 static inline void __list_splice(const struct list_head *list,
-                 struct list_head *cprev,
-                 struct list_head *cnext)
+                 struct list_head *c_prev,
+                 struct list_head *c_next)
 {
-    struct list_head *first = list->cnext;
-    struct list_head *last = list->cprev;
+    struct list_head *first = list->c_next;
+    struct list_head *last = list->c_prev;
 
-    first->cprev = cprev;
-    cprev->cnext = first;
+    first->c_prev = c_prev;
+    c_prev->c_next = first;
 
-    last->cnext = cnext;
-    cnext->cprev = last;
+    last->c_next = c_next;
+    c_next->c_prev = last;
 }
 
 /**
  * list_splice - join two lists, this is designed for stacks
- * @list: the cnew list to add.
+ * @list: the c_new list to add.
  * @head: the place to add it in the first list.
  */
 static inline void list_splice(const struct list_head *list,
                 struct list_head *head)
 {
     if (!list_empty(list))
-        __list_splice(list, head, head->cnext);
+        __list_splice(list, head, head->c_next);
 }
 
 /**
  * list_splice_tail - join two lists, each list being a queue
- * @list: the cnew list to add.
+ * @list: the c_new list to add.
  * @head: the place to add it in the first list.
  */
 static inline void list_splice_tail(struct list_head *list,
                 struct list_head *head)
 {
     if (!list_empty(list))
-        __list_splice(list, head->cprev, head);
+        __list_splice(list, head->c_prev, head);
 }
 
 /**
  * list_splice_init - join two lists and reinitialise the emptied list.
- * @list: the cnew list to add.
+ * @list: the c_new list to add.
  * @head: the place to add it in the first list.
  *
  * The list at @list is reinitialised
@@ -348,14 +348,14 @@
                     struct list_head *head)
 {
     if (!list_empty(list)) {
-        __list_splice(list, head, head->cnext);
+        __list_splice(list, head, head->c_next);
         INIT_LIST_HEAD(list);
     }
 }
 
 /**
  * list_splice_tail_init - join two lists and reinitialise the emptied list
- * @list: the cnew list to add.
+ * @list: the c_new list to add.
  * @head: the place to add it in the first list.
  *
  * Each of the lists is a queue.
@@ -365,7 +365,7 @@
                      struct list_head *head)
 {
     if (!list_empty(list)) {
-        __list_splice(list, head->cprev, head);
+        __list_splice(list, head->c_prev, head);
         INIT_LIST_HEAD(list);
     }
 }
@@ -388,7 +388,7 @@
  * Note, that list is expected to be not empty.
  */
 #define list_first_entry(ptr, type, member) \
-    list_entry((ptr)->cnext, type, member)
+    list_entry((ptr)->c_next, type, member)
 
 /**
  * list_last_entry - get the last element from a list
@@ -399,23 +399,23 @@
  * Note, that list is expected to be not empty.
  */
 #define list_last_entry(ptr, type, member) \
-    list_entry((ptr)->cprev, type, member)
+    list_entry((ptr)->c_prev, type, member)
 
 /**
- * list_next_entry - get the cnext element in list
+ * list_next_entry - get the c_next element in list
  * @pos:    the type * to cursor
  * @member:    the name of the list_head within the struct.
  */
 #define list_next_entry(pos, member) \
-    list_entry((pos)->member.cnext, typeof(*(pos)), member)
+    list_entry((pos)->member.c_next, typeof(*(pos)), member)
 
 /**
- * list_prev_entry - get the cprev element in list
+ * list_prev_entry - get the c_prev element in list
  * @pos:    the type * to cursor
  * @member:    the name of the list_head within the struct.
  */
 #define list_prev_entry(pos, member) \
-    list_entry((pos)->member.cprev, typeof(*(pos)), member)
+    list_entry((pos)->member.c_prev, typeof(*(pos)), member)
 
 /**
  * list_for_each    -    iterate over a list
@@ -423,8 +423,8 @@
  * @head:    the head for your list.
  */
 #define list_for_each(pos, head) \
-    for (pos = (head)->cnext; prefetch(pos->cnext), pos != (head); \
-            pos = pos->cnext)
+    for (pos = (head)->c_next; prefetch(pos->c_next), pos != (head); \
+            pos = pos->c_next)
 
 /**
  * __list_for_each    -    iterate over a list
@@ -437,7 +437,7 @@
  * or 1 entry) most of the time.
  */
 #define __list_for_each(pos, head) \
-    for (pos = (head)->cnext; pos != (head); pos = pos->cnext)
+    for (pos = (head)->c_next; pos != (head); pos = pos->c_next)
 
 /**
  * list_for_each_prev    -    iterate over a list backwards
@@ -445,8 +445,8 @@
  * @head:    the head for your list.
  */
 #define list_for_each_prev(pos, head) \
-    for (pos = (head)->cprev; prefetch(pos->cprev), pos != (head); \
-            pos = pos->cprev)
+    for (pos = (head)->c_prev; prefetch(pos->c_prev), pos != (head); \
+            pos = pos->c_prev)
 
 /**
  * list_for_each_safe - iterate over a list safe against removal of list entry
@@ -455,8 +455,8 @@
  * @head:    the head for your list.
  */
 #define list_for_each_safe(pos, n, head) \
-    for (pos = (head)->cnext, n = pos->cnext; pos != (head); \
-        pos = n, n = pos->cnext)
+    for (pos = (head)->c_next, n = pos->c_next; pos != (head); \
+        pos = n, n = pos->c_next)
 
 /**
  * list_for_each_prev_safe - iterate over a list backwards safe against removal of list entry
@@ -465,9 +465,9 @@
  * @head:    the head for your list.
  */
 #define list_for_each_prev_safe(pos, n, head) \
-    for (pos = (head)->cprev, n = pos->cprev; \
-         prefetch(pos->cprev), pos != (head); \
-         pos = n, n = pos->cprev)
+    for (pos = (head)->c_prev, n = pos->c_prev; \
+         prefetch(pos->c_prev), pos != (head); \
+         pos = n, n = pos->c_prev)
 
 /**
  * list_for_each_entry    -    iterate over list of given type
@@ -476,9 +476,9 @@
  * @member:    the name of the list_struct within the struct.
  */
 #define list_for_each_entry(pos, head, member)                \
-    for (pos = list_entry((head)->cnext, typeof(*pos), member);    \
-         prefetch(pos->member.cnext), &pos->member != (head);     \
-         pos = list_entry(pos->member.cnext, typeof(*pos), member))
+    for (pos = list_entry((head)->c_next, typeof(*pos), member);    \
+         prefetch(pos->member.c_next), &pos->member != (head);     \
+         pos = list_entry(pos->member.c_next, typeof(*pos), member))
 
 /**
  * list_for_each_entry_reverse - iterate backwards over list of given type.
@@ -487,9 +487,9 @@
  * @member:    the name of the list_struct within the struct.
  */
 #define list_for_each_entry_reverse(pos, head, member)            \
-    for (pos = list_entry((head)->cprev, typeof(*pos), member);    \
-         prefetch(pos->member.cprev), &pos->member != (head);     \
-         pos = list_entry(pos->member.cprev, typeof(*pos), member))
+    for (pos = list_entry((head)->c_prev, typeof(*pos), member);    \
+         prefetch(pos->member.c_prev), &pos->member != (head);     \
+         pos = list_entry(pos->member.c_prev, typeof(*pos), member))
 
 /**
  * list_prepare_entry - prepare a pos entry for use in list_for_each_entry_continue()
@@ -512,9 +512,9 @@
  * the current position.
  */
 #define list_for_each_entry_continue(pos, head, member)         \
-    for (pos = list_entry(pos->member.cnext, typeof(*pos), member);    \
-         prefetch(pos->member.cnext), &pos->member != (head);    \
-         pos = list_entry(pos->member.cnext, typeof(*pos), member))
+    for (pos = list_entry(pos->member.c_next, typeof(*pos), member);    \
+         prefetch(pos->member.c_next), &pos->member != (head);    \
+         pos = list_entry(pos->member.c_next, typeof(*pos), member))
 
 /**
  * list_for_each_entry_continue_reverse - iterate backwards from the given point
@@ -526,9 +526,9 @@
  * the current position.
  */
 #define list_for_each_entry_continue_reverse(pos, head, member)        \
-    for (pos = list_entry(pos->member.cprev, typeof(*pos), member);    \
-         prefetch(pos->member.cprev), &pos->member != (head);    \
-         pos = list_entry(pos->member.cprev, typeof(*pos), member))
+    for (pos = list_entry(pos->member.c_prev, typeof(*pos), member);    \
+         prefetch(pos->member.c_prev), &pos->member != (head);    \
+         pos = list_entry(pos->member.c_prev, typeof(*pos), member))
 
 /**
  * list_for_each_entry_from - iterate over list of given type from the current point
@@ -539,8 +539,8 @@
  * Iterate over list of given type, continuing from current position.
  */
 #define list_for_each_entry_from(pos, head, member)             \
-    for (; prefetch(pos->member.cnext), &pos->member != (head);    \
-         pos = list_entry(pos->member.cnext, typeof(*pos), member))
+    for (; prefetch(pos->member.c_next), &pos->member != (head);    \
+         pos = list_entry(pos->member.c_next, typeof(*pos), member))
 
 /**
  * list_for_each_entry_safe - iterate over list of given type safe against removal of list entry
@@ -550,10 +550,10 @@
  * @member:    the name of the list_struct within the struct.
  */
 #define list_for_each_entry_safe(pos, n, head, member)            \
-    for (pos = list_entry((head)->cnext, typeof(*pos), member),    \
-        n = list_entry(pos->member.cnext, typeof(*pos), member);    \
+    for (pos = list_entry((head)->c_next, typeof(*pos), member),    \
+        n = list_entry(pos->member.c_next, typeof(*pos), member);    \
          &pos->member != (head);                     \
-         pos = n, n = list_entry(n->member.cnext, typeof(*n), member))
+         pos = n, n = list_entry(n->member.c_next, typeof(*n), member))
 
 /**
  * list_for_each_entry_safe_continue - continue list iteration safe against removal
@@ -566,10 +566,10 @@
  * safe against removal of list entry.
  */
 #define list_for_each_entry_safe_continue(pos, n, head, member)         \
-    for (pos = list_entry(pos->member.cnext, typeof(*pos), member),         \
-        n = list_entry(pos->member.cnext, typeof(*pos), member);        \
+    for (pos = list_entry(pos->member.c_next, typeof(*pos), member),         \
+        n = list_entry(pos->member.c_next, typeof(*pos), member);        \
          &pos->member != (head);                        \
-         pos = n, n = list_entry(n->member.cnext, typeof(*n), member))
+         pos = n, n = list_entry(n->member.c_next, typeof(*n), member))
 
 /**
  * list_for_each_entry_safe_from - iterate over list from current point safe against removal
@@ -582,9 +582,9 @@
  * removal of list entry.
  */
 #define list_for_each_entry_safe_from(pos, n, head, member)             \
-    for (n = list_entry(pos->member.cnext, typeof(*pos), member);        \
+    for (n = list_entry(pos->member.c_next, typeof(*pos), member);        \
          &pos->member != (head);                        \
-         pos = n, n = list_entry(n->member.cnext, typeof(*n), member))
+         pos = n, n = list_entry(n->member.c_next, typeof(*n), member))
 
 /**
  * list_for_each_entry_safe_reverse - iterate backwards over list safe against removal
@@ -597,10 +597,10 @@
  * of list entry.
  */
 #define list_for_each_entry_safe_reverse(pos, n, head, member)        \
-    for (pos = list_entry((head)->cprev, typeof(*pos), member),    \
-        n = list_entry(pos->member.cprev, typeof(*pos), member);    \
+    for (pos = list_entry((head)->c_prev, typeof(*pos), member),    \
+        n = list_entry(pos->member.c_prev, typeof(*pos), member);    \
          &pos->member != (head);                     \
-         pos = n, n = list_entry(n->member.cprev, typeof(*n), member))
+         pos = n, n = list_entry(n->member.c_prev, typeof(*n), member))
 
 /*
  * Double linked lists with a single pointer list head.
@@ -614,7 +614,7 @@
 };
 
 struct hlist_node {
-    struct hlist_node *cnext, **pcprev;
+    struct hlist_node *c_next, **pc_prev;
 };
 
 #define HLIST_HEAD_INIT { .first = NULL }
@@ -622,13 +622,13 @@
 #define INIT_HLIST_HEAD(ptr) ((ptr)->first = NULL)
 static inline void INIT_HLIST_NODE(struct hlist_node *h)
 {
-    h->cnext = NULL;
-    h->pcprev = NULL;
+    h->c_next = NULL;
+    h->pc_prev = NULL;
 }
 
 static inline int hlist_unhashed(const struct hlist_node *h)
 {
-    return !h->pcprev;
+    return !h->pc_prev;
 }
 
 static inline int hlist_empty(const struct hlist_head *h)
@@ -638,18 +638,18 @@
 
 static inline void __hlist_del(struct hlist_node *n)
 {
-    struct hlist_node *cnext = n->cnext;
-    struct hlist_node **pcprev = n->pcprev;
-    *pcprev = cnext;
-    if (cnext)
-        cnext->pcprev = pcprev;
+    struct hlist_node *c_next = n->c_next;
+    struct hlist_node **pc_prev = n->pc_prev;
+    *pc_prev = c_next;
+    if (c_next)
+        c_next->pc_prev = pc_prev;
 }
 
 static inline void hlist_del(struct hlist_node *n)
 {
     __hlist_del(n);
-    n->cnext = (struct hlist_node *)LIST_POISON1;
-    n->pcprev = (struct hlist_node **)LIST_POISON2;
+    n->c_next = (struct hlist_node *)LIST_POISON1;
+    n->pc_prev = (struct hlist_node **)LIST_POISON2;
 }
 
 static inline void hlist_del_init(struct hlist_node *n)
@@ -663,55 +663,55 @@
 static inline void hlist_add_head(struct hlist_node *n, struct hlist_head *h)
 {
     struct hlist_node *first = h->first;
-    n->cnext = first;
+    n->c_next = first;
     if (first)
-        first->pcprev = &n->cnext;
+        first->pc_prev = &n->c_next;
     h->first = n;
-    n->pcprev = &h->first;
+    n->pc_prev = &h->first;
 }
 
-/* cnext must be != NULL */
+/* c_next must be != NULL */
 static inline void hlist_add_before(struct hlist_node *n,
-                    struct hlist_node *cnext)
+                    struct hlist_node *c_next)
 {
-    n->pcprev = cnext->pcprev;
-    n->cnext = cnext;
-    cnext->pcprev = &n->cnext;
-    *(n->pcprev) = n;
+    n->pc_prev = c_next->pc_prev;
+    n->c_next = c_next;
+    c_next->pc_prev = &n->c_next;
+    *(n->pc_prev) = n;
 }
 
 static inline void hlist_add_after(struct hlist_node *n,
-                    struct hlist_node *cnext)
+                    struct hlist_node *c_next)
 {
-    cnext->cnext = n->cnext;
-    n->cnext = cnext;
-    cnext->pcprev = &n->cnext;
+    c_next->c_next = n->c_next;
+    n->c_next = c_next;
+    c_next->pc_prev = &n->c_next;
 
-    if(cnext->cnext)
-        cnext->cnext->pcprev  = &cnext->cnext;
+    if(c_next->c_next)
+        c_next->c_next->pc_prev  = &c_next->c_next;
 }
 
 /*
- * Move a list from one list head to another. Fixup the pcprev
+ * Move a list from one list head to another. Fixup the pc_prev
  * reference of the first entry if it exists.
  */
 static inline void hlist_move_list(struct hlist_head *old,
-                   struct hlist_head *cnew)
+                   struct hlist_head *c_new)
 {
-    cnew->first = old->first;
-    if (cnew->first)
-        cnew->first->pcprev = &cnew->first;
+    c_new->first = old->first;
+    if (c_new->first)
+        c_new->first->pc_prev = &c_new->first;
     old->first = NULL;
 }
 
 #define hlist_entry(ptr, type, member) container_of(ptr,type,member)
 
 #define hlist_for_each(pos, head) \
-    for (pos = (head)->first; pos && ({ prefetch(pos->cnext); 1; }); \
-         pos = pos->cnext)
+    for (pos = (head)->first; pos && ({ prefetch(pos->c_next); 1; }); \
+         pos = pos->c_next)
 
 #define hlist_for_each_safe(pos, n, head) \
-    for (pos = (head)->first; pos && ({ n = pos->cnext; 1; }); \
+    for (pos = (head)->first; pos && ({ n = pos->c_next; 1; }); \
          pos = n)
 
 /**
@@ -723,9 +723,9 @@
  */
 #define hlist_for_each_entry(tpos, pos, head, member)             \
     for (pos = (head)->first;                     \
-         pos && ({ prefetch(pos->cnext); 1;}) &&             \
+         pos && ({ prefetch(pos->c_next); 1;}) &&             \
         ({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \
-         pos = pos->cnext)
+         pos = pos->c_next)
 
 /**
  * hlist_for_each_entry_continue - iterate over a hlist continuing after current point
@@ -734,10 +734,10 @@
  * @member:    the name of the hlist_node within the struct.
  */
 #define hlist_for_each_entry_continue(tpos, pos, member)         \
-    for (pos = (pos)->cnext;                         \
-         pos && ({ prefetch(pos->cnext); 1;}) &&             \
+    for (pos = (pos)->c_next;                         \
+         pos && ({ prefetch(pos->c_next); 1;}) &&             \
         ({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \
-         pos = pos->cnext)
+         pos = pos->c_next)
 
 /**
  * hlist_for_each_entry_from - iterate over a hlist continuing from current point
@@ -746,9 +746,9 @@
  * @member:    the name of the hlist_node within the struct.
  */
 #define hlist_for_each_entry_from(tpos, pos, member)             \
-    for (; pos && ({ prefetch(pos->cnext); 1;}) &&             \
+    for (; pos && ({ prefetch(pos->c_next); 1;}) &&             \
         ({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \
-         pos = pos->cnext)
+         pos = pos->c_next)
 
 /**
  * hlist_for_each_entry_safe - iterate over list of given type safe against removal of list entry
@@ -760,7 +760,7 @@
  */
 #define hlist_for_each_entry_safe(tpos, pos, n, head, member)          \
     for (pos = (head)->first;                     \
-         pos && ({ n = pos->cnext; 1; }) &&                  \
+         pos && ({ n = pos->c_next; 1; }) &&                  \
         ({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \
          pos = n)