ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

uhci: cleanup: Add an unlink call to uhci_async_cancel() 

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 <hdegoede@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Hans de Goede 2012-10-24 18:31:06 +02:00 committed by Gerd Hoffmann
parent 5b352ed537
commit 2f2ee2689f
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/usb/hcd-uhci.c
View File

@ -232,6 +232,7 @@ static void uhci_async_unlink(UHCIAsync *async)
static void uhci_async_cancel(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); trace_usb_uhci_packet_cancel(async->queue->token, async->td, async->done);
if (!async->done) if (!async->done)
usb_cancel_packet(&async->packet); usb_cancel_packet(&async->packet);
@ -266,7 +267,6 @@ static void uhci_async_validate_end(UHCIState *s)
} }
while (!QTAILQ_EMPTY(&queue->asyncs)) { while (!QTAILQ_EMPTY(&queue->asyncs)) {
async = QTAILQ_FIRST(&queue->asyncs); async = QTAILQ_FIRST(&queue->asyncs);
uhci_async_unlink(async);
uhci_async_cancel(async); uhci_async_cancel(async);
} }
uhci_queue_free(queue); uhci_queue_free(queue);
@ -284,7 +284,6 @@ static void uhci_async_cancel_device(UHCIState *s, USBDevice *dev)
curr->packet.ep->dev != dev) { curr->packet.ep->dev != dev) {
continue; continue;
} }
uhci_async_unlink(curr);
uhci_async_cancel(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(queue, &s->queues, next, nq) {
QTAILQ_FOREACH_SAFE(curr, &queue->asyncs, next, n) { QTAILQ_FOREACH_SAFE(curr, &queue->asyncs, next, n) {
uhci_async_unlink(curr);
uhci_async_cancel(curr); uhci_async_cancel(curr);
} }
uhci_queue_free(queue); uhci_queue_free(queue);