From patchwork Tue Apr 23 08:32:06 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 238792 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id AB9AA2C0125 for ; Tue, 23 Apr 2013 18:32:42 +1000 (EST) Received: from localhost ([::1]:41030 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UUYeW-0004kk-K8 for incoming@patchwork.ozlabs.org; Tue, 23 Apr 2013 04:32:40 -0400 Received: from eggs.gnu.org ([208.118.235.92]:56565) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UUYe7-0004kL-T1 for qemu-devel@nongnu.org; Tue, 23 Apr 2013 04:32:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UUYe5-0001LV-CU for qemu-devel@nongnu.org; Tue, 23 Apr 2013 04:32:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:61312) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UUYe5-0001L6-4u for qemu-devel@nongnu.org; Tue, 23 Apr 2013 04:32:13 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r3N8WBHB014032 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 23 Apr 2013 04:32:12 -0400 Received: from rincewind.home.kraxel.org (ovpn-116-29.ams2.redhat.com [10.36.116.29]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r3N8WAeG026512; Tue, 23 Apr 2013 04:32:11 -0400 Received: by rincewind.home.kraxel.org (Postfix, from userid 500) id EB90345B47; Tue, 23 Apr 2013 10:32:09 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 23 Apr 2013 10:32:06 +0200 Message-Id: <1366705929-11251-2-git-send-email-kraxel@redhat.com> In-Reply-To: <1366705929-11251-1-git-send-email-kraxel@redhat.com> References: <1366705929-11251-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 1/4] xhci: remove XHCIRing->base (unused) X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Gerd Hoffmann --- hw/usb/hcd-xhci.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c index a26b78e..2c90e56 100644 --- a/hw/usb/hcd-xhci.c +++ b/hw/usb/hcd-xhci.c @@ -326,7 +326,6 @@ typedef enum EPType { } EPType; typedef struct XHCIRing { - dma_addr_t base; dma_addr_t dequeue; bool ccs; } XHCIRing; @@ -943,7 +942,6 @@ static void xhci_event(XHCIState *xhci, XHCIEvent *event, int v) static void xhci_ring_init(XHCIState *xhci, XHCIRing *ring, dma_addr_t base) { - ring->base = base; ring->dequeue = base; ring->ccs = 1; } @@ -1948,7 +1946,7 @@ static void xhci_kick_ep(XHCIState *xhci, unsigned int slotid, streamid = 0; xhci_set_ep_state(xhci, epctx, NULL, EP_RUNNING); } - assert(ring->base != 0); + assert(ring->dequeue != 0); while (1) { XHCITransfer *xfer = &epctx->transfers[epctx->next_xfer];