From patchwork Thu Oct 6 08:06:03 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 117986 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id EE564B7010 for ; Thu, 6 Oct 2011 20:30:00 +1100 (EST) Received: from localhost ([::1]:45939 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RBjuY-0004jJ-0K for incoming@patchwork.ozlabs.org; Thu, 06 Oct 2011 05:06:38 -0400 Received: from eggs.gnu.org ([140.186.70.92]:44369) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RBixp-0002kx-Fd for qemu-devel@nongnu.org; Thu, 06 Oct 2011 04:06:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RBixV-00011u-Je for qemu-devel@nongnu.org; Thu, 06 Oct 2011 04:05:53 -0400 Received: from cantor2.suse.de ([195.135.220.15]:34676 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RBixU-00010E-Ju; Thu, 06 Oct 2011 04:05:36 -0400 Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.221.2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id 8BC5A90B96; Thu, 6 Oct 2011 10:05:35 +0200 (CEST) From: Alexander Graf To: qemu-devel@nongnu.org Date: Thu, 6 Oct 2011 10:06:03 +0200 Message-Id: <1317888366-10509-62-git-send-email-agraf@suse.de> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1317888366-10509-1-git-send-email-agraf@suse.de> References: <1317888366-10509-1-git-send-email-agraf@suse.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-Received-From: 195.135.220.15 Cc: Blue Swirl , qemu-ppc@nongnu.org Subject: [Qemu-devel] [PATCH 61/64] PPC: Clean up BookE timer code 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 The BookE timer code had some written-but-not-read variables. Get rid of them. Signed-off-by: Alexander Graf --- hw/ppc_booke.c | 14 +------------- 1 files changed, 1 insertions(+), 13 deletions(-) diff --git a/hw/ppc_booke.c b/hw/ppc_booke.c index 3e2fff5..8871945 100644 --- a/hw/ppc_booke.c +++ b/hw/ppc_booke.c @@ -153,15 +153,9 @@ static void booke_update_fixed_timer(CPUState *env, static void booke_decr_cb(void *opaque) { - CPUState *env; - ppc_tb_t *tb_env; - booke_timer_t *booke_timer; + CPUState *env = opaque; - env = opaque; - tb_env = env->tb_env; - booke_timer = tb_env->opaque; env->spr[SPR_BOOKE_TSR] |= TSR_DIS; - booke_update_irq(env); if (env->spr[SPR_BOOKE_TCR] & TCR_ARE) { @@ -211,13 +205,7 @@ static void booke_wdt_cb(void *opaque) void store_booke_tsr(CPUState *env, target_ulong val) { - ppc_tb_t *tb_env = env->tb_env; - booke_timer_t *booke_timer; - - booke_timer = tb_env->opaque; - env->spr[SPR_BOOKE_TSR] &= ~val; - booke_update_irq(env); }