[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/4] uhci: cleanup: Add an unlink call to uhci_async
From: |
Hans de Goede |
Subject: |
[Qemu-devel] [PATCH 3/4] uhci: cleanup: Add an unlink call to uhci_async_cancel() |
Date: |
Thu, 18 Oct 2012 16:08:58 +0200 |
All callers of uhci_async_cancel() call uhci_async_unlink() first, so
lets move the unlink call to uhci_async_cancel()
Signed-off-by: Hans de Goede <address@hidden>
---
hw/usb/hcd-uhci.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c
index a1d9c1f..1e0920e 100644
--- a/hw/usb/hcd-uhci.c
+++ b/hw/usb/hcd-uhci.c
@@ -232,6 +232,7 @@ static void uhci_async_unlink(UHCIAsync *async)
static void uhci_async_cancel(UHCIAsync *async)
{
+ uhci_async_unlink(async);
trace_usb_uhci_packet_cancel(async->queue->token, async->td, async->done);
if (!async->done)
usb_cancel_packet(&async->packet);
@@ -266,7 +267,6 @@ static void uhci_async_validate_end(UHCIState *s)
}
while (!QTAILQ_EMPTY(&queue->asyncs)) {
async = QTAILQ_FIRST(&queue->asyncs);
- uhci_async_unlink(async);
uhci_async_cancel(async);
}
uhci_queue_free(queue);
@@ -284,7 +284,6 @@ static void uhci_async_cancel_device(UHCIState *s,
USBDevice *dev)
curr->packet.ep->dev != dev) {
continue;
}
- uhci_async_unlink(curr);
uhci_async_cancel(curr);
}
}
@@ -297,7 +296,6 @@ static void uhci_async_cancel_all(UHCIState *s)
QTAILQ_FOREACH_SAFE(queue, &s->queues, next, nq) {
QTAILQ_FOREACH_SAFE(curr, &queue->asyncs, next, n) {
- uhci_async_unlink(curr);
uhci_async_cancel(curr);
}
uhci_queue_free(queue);
@@ -904,7 +902,6 @@ static void uhci_async_complete(USBPort *port, USBPacket
*packet)
UHCIState *s = async->queue->uhci;
if (packet->status == USB_RET_REMOVE_FROM_QUEUE) {
- uhci_async_unlink(async);
uhci_async_cancel(async);
return;
}
--
1.7.12.1