From patchwork Sun Mar 4 11:10:11 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 144491 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 EEC0DB6FA1 for ; Sun, 4 Mar 2012 22:08:37 +1100 (EST) Received: from localhost ([::1]:49216 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S49Ip-0007x9-Gb for incoming@patchwork.ozlabs.org; Sun, 04 Mar 2012 06:08:35 -0500 Received: from eggs.gnu.org ([208.118.235.92]:50234) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S49Ii-0007wr-HO for qemu-devel@nongnu.org; Sun, 04 Mar 2012 06:08:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S49Ig-0008WR-Sy for qemu-devel@nongnu.org; Sun, 04 Mar 2012 06:08:28 -0500 Received: from mx1.redhat.com ([209.132.183.28]:63761) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S49Ig-0008WH-LO for qemu-devel@nongnu.org; Sun, 04 Mar 2012 06:08:26 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q24B8O5S013516 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Sun, 4 Mar 2012 06:08:24 -0500 Received: from shalem.localdomain.com (vpn1-7-125.ams2.redhat.com [10.36.7.125]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q24B8Njw009637; Sun, 4 Mar 2012 06:08:23 -0500 From: Hans de Goede To: Gerd Hoffmann Date: Sun, 4 Mar 2012 12:10:11 +0100 Message-Id: <1330859411-16926-1-git-send-email-hdegoede@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: Hans de Goede , qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH] usb-ehci: drop unused isoch_pause variable 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: Hans de Goede --- hw/usb-ehci.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/hw/usb-ehci.c b/hw/usb-ehci.c index df742f7..f4d53ff 100644 --- a/hw/usb-ehci.c +++ b/hw/usb-ehci.c @@ -419,7 +419,6 @@ struct EHCIState { USBPacket ipacket; QEMUSGList isgl; - int isoch_pause; uint64_t last_run_ns; }; @@ -907,7 +906,6 @@ static void ehci_reset(void *opaque) s->astate = EST_INACTIVE; s->pstate = EST_INACTIVE; - s->isoch_pause = -1; s->attach_poll_counter = 0; for(i = 0; i < NB_PORTS; i++) { @@ -2150,9 +2148,7 @@ static void ehci_frame_timer(void *opaque) for (i = 0; i < frames; i++) { if ( !(ehci->usbsts & USBSTS_HALT)) { - if (ehci->isoch_pause <= 0) { - ehci->frindex += 8; - } + ehci->frindex += 8; if (ehci->frindex > 0x00001fff) { ehci->frindex = 0;