[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 5/7] usb-hcd-xhci: Remove unused cancelled member fr
From: |
Hans de Goede |
Subject: |
[Qemu-devel] [PATCH 5/7] usb-hcd-xhci: Remove unused cancelled member from XHCITransfer |
Date: |
Mon, 23 Sep 2013 20:54:05 +0200 |
Since qemu's USB model is geared towards emulated devices cancellation
is instanteneous, so no need to wait for cancellation to complete, as
such there is no wait for cancellation code, and the cancelled bool
as well as the bogus comment about it can be removed.
Signed-off-by: Hans de Goede <address@hidden>
---
hw/usb/hcd-xhci.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c
index b343235..9845554 100644
--- a/hw/usb/hcd-xhci.c
+++ b/hw/usb/hcd-xhci.c
@@ -346,7 +346,6 @@ typedef struct XHCITransfer {
QEMUSGList sgl;
bool running_async;
bool running_retry;
- bool cancelled;
bool complete;
bool int_req;
unsigned int iso_pkts;
@@ -1347,8 +1346,6 @@ static int xhci_ep_nuke_one_xfer(XHCITransfer *t)
if (t->running_async) {
usb_cancel_packet(&t->packet);
t->running_async = 0;
- t->cancelled = 1;
- DPRINTF("xhci: cancelling transfer, waiting for it to complete\n");
killed = 1;
}
if (t->running_retry) {
@@ -1765,14 +1762,12 @@ static int xhci_complete_packet(XHCITransfer *xfer)
xfer->running_async = 1;
xfer->running_retry = 0;
xfer->complete = 0;
- xfer->cancelled = 0;
return 0;
} else if (xfer->packet.status == USB_RET_NAK) {
trace_usb_xhci_xfer_nak(xfer);
xfer->running_async = 0;
xfer->running_retry = 1;
xfer->complete = 0;
- xfer->cancelled = 0;
return 0;
} else {
xfer->running_async = 0;
--
1.8.3.1
- [Qemu-devel] [PATCH 0/7] usb: host-libusb and xhci fixes, Hans de Goede, 2013/09/23
- [Qemu-devel] [PATCH 1/7] usb-host-libusb: Fix reset handling, Hans de Goede, 2013/09/23
- [Qemu-devel] [PATCH 2/7] usb-host-libusb: Configuration 0 may be a valid configuration, Hans de Goede, 2013/09/23
- [Qemu-devel] [PATCH 3/7] usb-host-libusb: Detach kernel drivers earlier, Hans de Goede, 2013/09/23
- [Qemu-devel] [PATCH 4/7] usb-hcd-xhci: Remove unused sstreamsm member from XHCIStreamContext, Hans de Goede, 2013/09/23
- [Qemu-devel] [PATCH 5/7] usb-hcd-xhci: Remove unused cancelled member from XHCITransfer,
Hans de Goede <=
- [Qemu-devel] [PATCH 6/7] usb-hcd-xhci: Report completion of active transfer with CC_STOPPED on ep stop, Hans de Goede, 2013/09/23
- [Qemu-devel] [PATCH 7/7] usb-hcd-xhci: Update endpoint context dequeue pointer for streams too, Hans de Goede, 2013/09/23