patch-2.4.7 linux/drivers/usb/uhci.c

• Lines: 99
• Date: Wed Jul 4 15:43:05 2001
• Orig file: v2.4.6/linux/drivers/usb/uhci.c
• Orig date: Tue Jul 3 17:08:21 2001

diff -u --recursive --new-file v2.4.6/linux/drivers/usb/uhci.c linux/drivers/usb/uhci.c
@@ -62,7 +62,7 @@
  * Version Information
  */
 #define DRIVER_VERSION ""
-#define DRIVER_AUTHOR "Linus Torvalds, Johannes Erdfelt, Randy Dunlap, Georg Acher, Deti Fliegl, Thomas Sailer, Roman Weissgaerber"
+#define DRIVER_AUTHOR "Linus 'Frodo Rabbit' Torvalds, Johannes Erdfelt, Randy Dunlap, Georg Acher, Deti Fliegl, Thomas Sailer, Roman Weissgaerber"
 #define DRIVER_DESC "USB Universal Host Controller Interface driver"
 
 
@@ -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);