Since uhci_stop now saves IRQ state, the free/remove pending routines
no longer need irqsave/irqrestore.
diff -Nru a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c
--- a/drivers/usb/host/uhci-hcd.c Mon Feb 9 12:56:25 2004
+++ b/drivers/usb/host/uhci-hcd.c Mon Feb 9 12:56:26 2004
@@ -1800,9 +1800,8 @@
static void uhci_free_pending_qhs(struct uhci_hcd *uhci)
{
struct list_head *tmp, *head;
- unsigned long flags;
- spin_lock_irqsave(&uhci->qh_remove_list_lock, flags);
+ spin_lock(&uhci->qh_remove_list_lock);
head = &uhci->qh_remove_list;
tmp = head->next;
while (tmp != head) {
@@ -1814,15 +1813,14 @@
uhci_free_qh(uhci, qh);
}
- spin_unlock_irqrestore(&uhci->qh_remove_list_lock, flags);
+ spin_unlock(&uhci->qh_remove_list_lock);
}
static void uhci_free_pending_tds(struct uhci_hcd *uhci)
{
struct list_head *tmp, *head;
- unsigned long flags;
- spin_lock_irqsave(&uhci->td_remove_list_lock, flags);
+ spin_lock(&uhci->td_remove_list_lock);
head = &uhci->td_remove_list;
tmp = head->next;
while (tmp != head) {
@@ -1834,7 +1832,7 @@
uhci_free_td(uhci, td);
}
- spin_unlock_irqrestore(&uhci->td_remove_list_lock, flags);
+ spin_unlock(&uhci->td_remove_list_lock);
}
static void uhci_finish_urb(struct usb_hcd *hcd, struct urb *urb, struct pt_regs
*regs)
@@ -1881,9 +1879,8 @@
static void uhci_remove_pending_qhs(struct uhci_hcd *uhci)
{
struct list_head *tmp, *head;
- unsigned long flags;
- spin_lock_irqsave(&uhci->urb_remove_list_lock, flags);
+ spin_lock(&uhci->urb_remove_list_lock);
head = &uhci->urb_remove_list;
tmp = head->next;
while (tmp != head) {
@@ -1896,7 +1893,7 @@
uhci_moveto_complete(uhci, urb);
}
- spin_unlock_irqrestore(&uhci->urb_remove_list_lock, flags);
+ spin_unlock(&uhci->urb_remove_list_lock);
}
static void uhci_irq(struct usb_hcd *hcd, struct pt_regs *regs)
-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
