[linux-usb-devel] [PATCH] UHCI: Use list_del_init

[Herbert Xu]

This patch merges list_del/INIT_LIST_HEAD calls into list_del_init ones.
-- 
Debian GNU/Linux 2.2 is out! ( http://www.debian.org/ )
Email:  Herbert Xu ~{PmV>HI~} <[EMAIL PROTECTED]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

Index: drivers/usb/uhci.c
===================================================================
RCS file: /home/gondolin/herbert/src/CVS/debian/kernel-source-2.4/drivers/usb/uhci.c,v
retrieving revision 1.2
diff -u -r1.2 uhci.c
--- drivers/usb/uhci.c  2001/06/05 09:51:39     1.2
+++ drivers/usb/uhci.c  2001/06/05 09:53:14
@@ -305,8 +305,7 @@
        mb();
        td->link = UHCI_PTR_TERM;
 
-       list_del(&td->fl_list);
-       INIT_LIST_HEAD(&td->fl_list);
+       list_del_init(&td->fl_list);
        td->frame = -1;
 
        spin_unlock_irqrestore(&uhci->frame_list_lock, flags);
@@ -438,8 +437,7 @@
        mb();
        qh->element = qh->link = UHCI_PTR_TERM;
 
-       list_del(&qh->list);
-       INIT_LIST_HEAD(&qh->list);
+       list_del_init(&qh->list);
 
        spin_unlock_irqrestore(&uhci->frame_list_lock, flags);
 
@@ -624,8 +622,7 @@
                        pltd->link = UHCI_PTR_TERM;
        }
 
-       list_del(&urbp->queue_list);
-       INIT_LIST_HEAD(&urbp->queue_list);
+       list_del_init(&urbp->queue_list);
 
 out:
        spin_unlock_irqrestore(&uhci->frame_list_lock, flags);
@@ -689,8 +686,7 @@
        if (list_empty(&td->list))
                return;
 
-       list_del(&td->list);
-       INIT_LIST_HEAD(&td->list);
+       list_del_init(&td->list);
 
        td->urb = NULL;
 }
@@ -1665,8 +1661,7 @@
                        usb_pipetype(urb->pipe), urb);
        }
 
-       list_del(&urb->urb_list);
-       INIT_LIST_HEAD(&urb->urb_list);
+       list_del_init(&urb->urb_list);
 
        uhci_add_complete(urb);
 }
@@ -1723,8 +1718,7 @@
                return 0;
 
        spin_lock_irqsave(&uhci->urb_list_lock, flags);
-       list_del(&urb->urb_list);
-       INIT_LIST_HEAD(&urb->urb_list);
+       list_del_init(&urb->urb_list);
        spin_unlock_irqrestore(&uhci->urb_list_lock, flags);
 
        uhci_unlink_generic(uhci, urb);
@@ -2206,8 +2200,7 @@
 
                tmp = tmp->next;
 
-               list_del(&qh->remove_list);
-               INIT_LIST_HEAD(&qh->remove_list);
+               list_del_init(&qh->remove_list);
 
                uhci_free_qh(uhci, qh);
        }
@@ -2300,8 +2293,7 @@
 
                tmp = tmp->next;
 
-               list_del(&urbp->complete_list);
-               INIT_LIST_HEAD(&urbp->complete_list);
+               list_del_init(&urbp->complete_list);
 
                uhci_call_completion(urb);
        }
@@ -2322,8 +2314,7 @@
 
                tmp = tmp->next;
 
-               list_del(&urb->urb_list);
-               INIT_LIST_HEAD(&urb->urb_list);
+               list_del_init(&urb->urb_list);
 
                urbp->status = urb->status = -ECONNRESET;
                uhci_call_completion(urb);