From patchwork Fri Oct 26 06:09:58 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Crosthwaite X-Patchwork-Id: 194372 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 2D6CF2C00A4 for ; Fri, 26 Oct 2012 17:10:26 +1100 (EST) Received: from localhost ([::1]:45469 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TRd7g-00017s-6e for incoming@patchwork.ozlabs.org; Fri, 26 Oct 2012 02:10:24 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57567) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TRd7S-0000yF-Sv for qemu-devel@nongnu.org; Fri, 26 Oct 2012 02:10:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TRd7R-0006W6-Sf for qemu-devel@nongnu.org; Fri, 26 Oct 2012 02:10:10 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:48841) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TRd7R-0006Vu-Mi for qemu-devel@nongnu.org; Fri, 26 Oct 2012 02:10:09 -0400 Received: by mail-pa0-f45.google.com with SMTP id fb10so1626410pad.4 for ; Thu, 25 Oct 2012 23:10:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:in-reply-to:references:x-gm-message-state; bh=Ieogy/5JlmaldaIBAUdR860mJYNvd0YglcF8Hppm7h8=; b=S8AYYp3Qep8hGicinO2k0UEt9dWhf4t4D2/FQvpe5wT12xz7XKjtrSy3w0a06yVq62 mzoh5FGiFR7xsiCcoGXybA7VJgzTqpTHJTghpVKQBrukns6cWDlnbp2Yt5kqTAtZNh6e 3c3VW1uvzVYvOA8rRYfwCoX7MFCP2RYWEUnjf+jtdhyNCUQ561EySUOLz0jOoTepiGss 0NVS8F770ydC8dzVp6afnJHmfOvA/FuXpxnRnKQAZKm+UXBQ8HNXBvmR1rkWGAG4agKX C4/BrH3UFaaf8lZUv9qvSDkz78z/k0kgrvrFjPGBH8gjmWxp0Zh8av/ySs/gQfH5vQxo amxw== Received: by 10.68.137.198 with SMTP id qk6mr66658881pbb.60.1351231809004; Thu, 25 Oct 2012 23:10:09 -0700 (PDT) Received: from localhost ([124.148.20.9]) by mx.google.com with ESMTPS id c8sm484144pav.4.2012.10.25.23.10.05 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 25 Oct 2012 23:10:08 -0700 (PDT) From: Peter Crosthwaite To: qemu-devel@nongnu.org Date: Fri, 26 Oct 2012 16:09:58 +1000 Message-Id: X-Mailer: git-send-email 1.7.0.4 In-Reply-To: References: In-Reply-To: References: X-Gm-Message-State: ALoCoQlGfDVrdW2814liDWHVldQboBG4e2ydVYys093oIMkREzhsvJjmo/UJofmetv1o42R0PAvw X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.220.45 Cc: vineshp@xilinx.com, peter.maydell@linaro.org, Peter Crosthwaite , john.williams@xilinx.com, pbonzini@redhat.com, edgar.iglesias@gmail.com Subject: [Qemu-devel] [PATCH v3 1/4] pflash_cfi0x: remove unused base field 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 This field is completely unused. The base address should also be abstracted away from the device anyway. Removed. Signed-off-by: Peter Crosthwaite Reviewed-by: Peter Maydell --- hw/pflash_cfi01.c | 2 -- hw/pflash_cfi02.c | 4 +--- 2 files changed, 1 insertions(+), 5 deletions(-) diff --git a/hw/pflash_cfi01.c b/hw/pflash_cfi01.c index 5e3a409..2e29f8a 100644 --- a/hw/pflash_cfi01.c +++ b/hw/pflash_cfi01.c @@ -61,7 +61,6 @@ do { \ struct pflash_t { BlockDriverState *bs; - hwaddr base; hwaddr sector_len; hwaddr total_len; int width; @@ -594,7 +593,6 @@ pflash_t *pflash_cfi01_register(hwaddr base, } pfl->timer = qemu_new_timer_ns(vm_clock, pflash_timer, pfl); - pfl->base = base; pfl->sector_len = sector_len; pfl->total_len = total_len; pfl->width = width; diff --git a/hw/pflash_cfi02.c b/hw/pflash_cfi02.c index 9f94c06..083718b 100644 --- a/hw/pflash_cfi02.c +++ b/hw/pflash_cfi02.c @@ -56,7 +56,6 @@ do { \ struct pflash_t { BlockDriverState *bs; - hwaddr base; uint32_t sector_len; uint32_t chip_len; int mappings; @@ -602,7 +601,6 @@ pflash_t *pflash_cfi02_register(hwaddr base, name, size); vmstate_register_ram(&pfl->orig_mem, qdev); pfl->storage = memory_region_get_ram_ptr(&pfl->orig_mem); - pfl->base = base; pfl->chip_len = chip_len; pfl->mappings = nb_mappings; pfl->bs = bs; @@ -618,7 +616,7 @@ pflash_t *pflash_cfi02_register(hwaddr base, pflash_setup_mappings(pfl); pfl->rom_mode = 1; - memory_region_add_subregion(get_system_memory(), pfl->base, &pfl->mem); + memory_region_add_subregion(get_system_memory(), base, &pfl->mem); if (pfl->bs) { pfl->ro = bdrv_is_read_only(pfl->bs);