From patchwork Tue Mar 19 18:24:28 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 15434 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id B98FD23E00 for ; Tue, 19 Mar 2013 18:24:36 +0000 (UTC) Received: from mail-vb0-f44.google.com (mail-vb0-f44.google.com [209.85.212.44]) by fiordland.canonical.com (Postfix) with ESMTP id 6D384A19318 for ; Tue, 19 Mar 2013 18:24:36 +0000 (UTC) Received: by mail-vb0-f44.google.com with SMTP id fr13so520128vbb.31 for ; Tue, 19 Mar 2013 11:24:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state; bh=FPlkgLcSGmFRXCLNmbinat+SW/9N5dOlu0/rfG9CRxY=; b=MlGcrauy4ISMRP+wbFhYYY7UlGmfrt8dEOWwtsVEhE5fY6uHkgwwF5kaQ6gq96p04X bID2dlj4SjFnswa/VgLrwizqdykPqj5grqBEI8ppaVGAxeyCajolNhFHTF5QT5ky4Ymz RVvR5CMD1zYjlVbBR1K/L1X+9YDzCseiEmfOBPGqk0BTopYKGjgpqjiJkhawDN3e8lP6 /xg7gybbD42eR0TqFefodOjQafR56Zh1J/SfXXulbkJ40hK0QwojM3m0u5/d3CQtgpR7 4kYkAFLxYJnrp4wiFWyNR1a7OdtJE9RpGrZQNsZIHqtNQWbMoa3sQoX6K9g0owPUxU+S dSnw== X-Received: by 10.221.0.199 with SMTP id nn7mr4066450vcb.14.1363717475818; Tue, 19 Mar 2013 11:24:35 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.58.127.98 with SMTP id nf2csp121692veb; Tue, 19 Mar 2013 11:24:35 -0700 (PDT) X-Received: by 10.204.146.141 with SMTP id h13mr6179891bkv.127.1363717473450; Tue, 19 Mar 2013 11:24:33 -0700 (PDT) Received: from mnementh.archaic.org.uk (1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.d.1.0.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id b14si6734616bka.92.2013.03.19.11.24.32 (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 19 Mar 2013 11:24:33 -0700 (PDT) Received-SPF: neutral (google.com: 2001:8b0:1d0::1 is neither permitted nor denied by best guess record for domain of pm215@archaic.org.uk) client-ip=2001:8b0:1d0::1; Authentication-Results: mx.google.com; spf=neutral (google.com: 2001:8b0:1d0::1 is neither permitted nor denied by best guess record for domain of pm215@archaic.org.uk) smtp.mail=pm215@archaic.org.uk Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1UI1D3-000849-OZ; Tue, 19 Mar 2013 18:24:29 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Anthony Liguori , Juan Quintela Subject: [PATCH 1/2] pflash_cfi01: Drop unused 'bypass' field Date: Tue, 19 Mar 2013 18:24:28 +0000 Message-Id: <1363717469-30980-2-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1363717469-30980-1-git-send-email-peter.maydell@linaro.org> References: <1363717469-30980-1-git-send-email-peter.maydell@linaro.org> X-Gm-Message-State: ALoCoQkR8fm7sKWjz6k2IZrNxuIa7PPLi1cbJvszuEA2qAqazgySvb1gRoX7h3reGsf7TPJSOqS7 For pflash_cfi01 the 'bypass' field is set to zero and never changes, so remove it (it is a leftover from pflash_cfi02, where bypass is implemented). Signed-off-by: Peter Maydell --- hw/pflash_cfi01.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/hw/pflash_cfi01.c b/hw/pflash_cfi01.c index 5d57bab..20d10b3 100644 --- a/hw/pflash_cfi01.c +++ b/hw/pflash_cfi01.c @@ -68,7 +68,6 @@ struct pflash_t { uint8_t width; uint8_t be; int wcycle; /* if 0, the flash is read normally */ - int bypass; int ro; uint8_t cmd; uint8_t status; @@ -93,12 +92,8 @@ static void pflash_timer (void *opaque) DPRINTF("%s: command %02x done\n", __func__, pfl->cmd); /* Reset flash */ pfl->status ^= 0x80; - if (pfl->bypass) { - pfl->wcycle = 2; - } else { - memory_region_rom_device_set_readable(&pfl->mem, true); - pfl->wcycle = 0; - } + memory_region_rom_device_set_readable(&pfl->mem, true); + pfl->wcycle = 0; pfl->cmd = 0; } @@ -452,7 +447,6 @@ static void pflash_write(pflash_t *pfl, hwaddr offset, reset_flash: memory_region_rom_device_set_readable(&pfl->mem, true); - pfl->bypass = 0; pfl->wcycle = 0; pfl->cmd = 0; }