From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59133) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UI1UW-0005mE-Bt for qemu-devel@nongnu.org; Tue, 19 Mar 2013 14:42:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UI1UT-0004uy-IN for qemu-devel@nongnu.org; Tue, 19 Mar 2013 14:42:32 -0400 Received: from 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]:33029 helo=mnementh.archaic.org.uk) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UI1UT-0004us-Bp for qemu-devel@nongnu.org; Tue, 19 Mar 2013 14:42:29 -0400 From: Peter Maydell Date: Tue, 19 Mar 2013 18:24:28 +0000 Message-Id: <1363717469-30980-2-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1363717469-30980-1-git-send-email-peter.maydell@linaro.org> References: <1363717469-30980-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH 1/2] pflash_cfi01: Drop unused 'bypass' field List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori , Juan Quintela , patches@linaro.org 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; } -- 1.7.9.5