diff mbox series

[1/3] ccan: switch list_add_before/after arguments to match upstream

Message ID 20211208141558.513912-2-npiggin@gmail.com
State Accepted
Headers show
Series grab upstream ccan | expand

Commit Message

Nicholas Piggin Dec. 8, 2021, 2:15 p.m. UTC 
Upstream ccan uses (list, existing entry, new entry) parameter ordering
rather than (list, new entry, existing entry) ordering.

Switch these to make syncing with upstream simpler.

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
---
 ccan/list/list.h  | 12 ++++++------
 core/device.c     |  2 +-
 core/mem_region.c |  4 ++--
 core/timer.c      |  2 +-
 hw/xscom.c        |  2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)
diff mbox series

Patch

diff --git a/ccan/list/list.h b/ccan/list/list.h
index 1d75dd92a..6dbaabfe0 100644
--- a/ccan/list/list.h
+++ b/ccan/list/list.h
@@ -167,13 +167,13 @@  static inline void list_add(struct list_head *h, struct list_node *n)
 /**
  * list_add_before - add an entry before another entry.
  * @h: the list_head to add the node to (we use it for debug purposes, can be NULL)
- * @n: the list_node to add to the list.
  * @p: the list_node of the other entry
+ * @n: the list_node to add to the list.
  *
  * The list_node does not need to be initialized; it will be overwritten.
  */
-static inline void list_add_before(struct list_head *h, struct list_node *n,
-				   struct list_node *p)
+static inline void list_add_before(struct list_head *h, struct list_node *p,
+				   struct list_node *n)
 {
 	n->next = p;
 	n->prev = p->prev;
@@ -186,13 +186,13 @@  static inline void list_add_before(struct list_head *h, struct list_node *n,
 /**
  * list_add_after - add an entry after another entry.
  * @h: the list_head to add the node to (we use it for debug purposes, can be NULL)
- * @n: the list_node to add to the list.
  * @p: the list_node of the other entry
+ * @n: the list_node to add to the list.
  *
  * The list_node does not need to be initialized; it will be overwritten.
  */
-static inline void list_add_after(struct list_head *h, struct list_node *n,
-				  struct list_node *p)
+static inline void list_add_after(struct list_head *h, struct list_node *p,
+				  struct list_node *n)
 {
 	n->next = p->next;
 	n->prev = p;
diff --git a/core/device.c b/core/device.c
index b102dd973..2de37c741 100644
--- a/core/device.c
+++ b/core/device.c
@@ -120,7 +120,7 @@  bool dt_attach_root(struct dt_node *parent, struct dt_node *root)
 			break;
 	}
 
-	list_add_before(&parent->children, &root->list, &node->list);
+	list_add_before(&parent->children, &node->list, &root->list);
 	root->parent = parent;
 
 	return true;
diff --git a/core/mem_region.c b/core/mem_region.c
index 36de2d094..e78d0a940 100644
--- a/core/mem_region.c
+++ b/core/mem_region.c
@@ -734,7 +734,7 @@  static bool maybe_split(struct mem_region *r, uint64_t split_at)
 		return false;
 
 	/* Tail add is important: we may need to split again! */
-	list_add_after(&regions, &tail->list, &r->list);
+	list_add_after(&regions, &r->list, &tail->list);
 	return true;
 }
 
@@ -771,7 +771,7 @@  static void add_region_to_regions(struct mem_region *region)
 		if (r->start < region->start)
 			continue;
 
-		list_add_before(&regions, &region->list, &r->list);
+		list_add_before(&regions, &r->list, &region->list);
 		return;
 	}
 	list_add_tail(&regions, &region->list);
diff --git a/core/timer.c b/core/timer.c
index 652ffba30..43c388314 100644
--- a/core/timer.c
+++ b/core/timer.c
@@ -121,7 +121,7 @@  static void __schedule_timer_at(struct timer *t, uint64_t when)
 		list_for_each(&timer_list, lt, link) {
 			if (when >= lt->target)
 				continue;
-			list_add_before(&timer_list, &t->link, &lt->link);
+			list_add_before(&timer_list, &lt->link, &t->link);
 			goto bail;
 		}
 		list_add_tail(&timer_list, &t->link);
diff --git a/hw/xscom.c b/hw/xscom.c
index 298fe0c90..530ac955b 100644
--- a/hw/xscom.c
+++ b/hw/xscom.c
@@ -616,7 +616,7 @@  int64_t scom_register(struct scom_controller *new)
 		}
 
 		if (cur->part_id > new->part_id) {
-			list_add_before(&scom_list, &new->link, &cur->link);
+			list_add_before(&scom_list, &cur->link, &new->link);
 			return 0;
 		}
 	}