Browse Source

[CASSINI]: Use shorter list_splice_init() macro for brevity.

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: David S. Miller <davem@davemloft.net>
Robert P. J. Day 17 years ago
parent
commit
9bd512f619
1 changed files with 4 additions and 8 deletions
  1. 4 8
      drivers/net/cassini.c

+ 4 - 8
drivers/net/cassini.c

@@ -532,8 +532,7 @@ static void cas_spare_free(struct cas *cp)
 	/* free spare buffers */
 	/* free spare buffers */
 	INIT_LIST_HEAD(&list);
 	INIT_LIST_HEAD(&list);
 	spin_lock(&cp->rx_spare_lock);
 	spin_lock(&cp->rx_spare_lock);
-	list_splice(&cp->rx_spare_list, &list);
-	INIT_LIST_HEAD(&cp->rx_spare_list);
+	list_splice_init(&cp->rx_spare_list, &list);
 	spin_unlock(&cp->rx_spare_lock);
 	spin_unlock(&cp->rx_spare_lock);
 	list_for_each_safe(elem, tmp, &list) {
 	list_for_each_safe(elem, tmp, &list) {
 		cas_page_free(cp, list_entry(elem, cas_page_t, list));
 		cas_page_free(cp, list_entry(elem, cas_page_t, list));
@@ -546,13 +545,11 @@ static void cas_spare_free(struct cas *cp)
 	 * lock than used everywhere else to manipulate this list.
 	 * lock than used everywhere else to manipulate this list.
 	 */
 	 */
 	spin_lock(&cp->rx_inuse_lock);
 	spin_lock(&cp->rx_inuse_lock);
-	list_splice(&cp->rx_inuse_list, &list);
-	INIT_LIST_HEAD(&cp->rx_inuse_list);
+	list_splice_init(&cp->rx_inuse_list, &list);
 	spin_unlock(&cp->rx_inuse_lock);
 	spin_unlock(&cp->rx_inuse_lock);
 #else
 #else
 	spin_lock(&cp->rx_spare_lock);
 	spin_lock(&cp->rx_spare_lock);
-	list_splice(&cp->rx_inuse_list, &list);
-	INIT_LIST_HEAD(&cp->rx_inuse_list);
+	list_splice_init(&cp->rx_inuse_list, &list);
 	spin_unlock(&cp->rx_spare_lock);
 	spin_unlock(&cp->rx_spare_lock);
 #endif
 #endif
 	list_for_each_safe(elem, tmp, &list) {
 	list_for_each_safe(elem, tmp, &list) {
@@ -573,8 +570,7 @@ static void cas_spare_recover(struct cas *cp, const gfp_t flags)
 	/* make a local copy of the list */
 	/* make a local copy of the list */
 	INIT_LIST_HEAD(&list);
 	INIT_LIST_HEAD(&list);
 	spin_lock(&cp->rx_inuse_lock);
 	spin_lock(&cp->rx_inuse_lock);
-	list_splice(&cp->rx_inuse_list, &list);
-	INIT_LIST_HEAD(&cp->rx_inuse_list);
+	list_splice_init(&cp->rx_inuse_list, &list);
 	spin_unlock(&cp->rx_inuse_lock);
 	spin_unlock(&cp->rx_inuse_lock);
 
 
 	list_for_each_safe(elem, tmp, &list) {
 	list_for_each_safe(elem, tmp, &list) {