From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:42252) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOqky-0008Tu-4H for qemu-devel@nongnu.org; Thu, 18 Oct 2012 10:07:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TOqkw-0002iX-DI for qemu-devel@nongnu.org; Thu, 18 Oct 2012 10:07:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45593) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOqkw-0002iP-4w for qemu-devel@nongnu.org; Thu, 18 Oct 2012 10:07:26 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q9IE7POR015883 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 18 Oct 2012 10:07:25 -0400 From: Hans de Goede Date: Thu, 18 Oct 2012 16:08:58 +0200 Message-Id: <1350569339-2811-4-git-send-email-hdegoede@redhat.com> In-Reply-To: <1350569339-2811-1-git-send-email-hdegoede@redhat.com> References: <1350569339-2811-1-git-send-email-hdegoede@redhat.com> Subject: [Qemu-devel] [PATCH 3/4] uhci: cleanup: Add an unlink call to uhci_async_cancel() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Gerd Hoffmann Cc: Hans de Goede , qemu-devel@nongnu.org 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 --- 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