[PATCH 4/5] ptrlist: move DO_SPLIT() into DO_INSERT_CURRENT()

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



DO_SPLIT() has only a single user and don't see to be
usable standalone.

So, merge it into its user, DO_INSERT_CURRENT().

Signed-off-by: Luc Van Oostenryck <luc.vanoostenryck@xxxxxxxxx>
---
 ptrlist.h | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/ptrlist.h b/ptrlist.h
index b24533ba5..1dd41a602 100644
--- a/ptrlist.h
+++ b/ptrlist.h
@@ -231,18 +231,15 @@ extern void __free_ptr_list(struct ptr_list **);
 
 extern void split_ptr_list_head(struct ptr_list *);
 
-#define DO_SPLIT(__head, __list, __nr) do {				\
-	split_ptr_list_head((struct ptr_list*)__list);			\
-	if (__nr >= __list->nr) {					\
-		__nr -= __list->nr;					\
-		__list = __list->next;					\
-	};								\
-} while (0)
-
 #define DO_INSERT_CURRENT(new, __head, __list, __nr) do {		\
 	TYPEOF(__head) __this, __last;					\
-	if (__list->nr == LIST_NODE_NR)					\
-		DO_SPLIT(__head, __list, __nr);				\
+	if (__list->nr == LIST_NODE_NR) {				\
+		split_ptr_list_head((struct ptr_list*)__list);		\
+		if (__nr >= __list->nr) {				\
+			__nr -= __list->nr;				\
+			__list = __list->next;				\
+		}							\
+	}								\
 	__this = __list->list + __nr;					\
 	__last = __list->list + __list->nr - 1;				\
 	while (__last >= __this) {					\
-- 
2.17.1

--
To unsubscribe from this list: send the line "unsubscribe linux-sparse" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Newbies FAQ]     [LKML]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Trinity Fuzzer Tool]

  Powered by Linux