From patchwork Fri Apr 20 12:52:33 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 154033 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 6FC60B7056 for ; Fri, 20 Apr 2012 22:53:07 +1000 (EST) Received: from localhost ([::1]:45598 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SLDKh-0002lT-FH for incoming@patchwork.ozlabs.org; Fri, 20 Apr 2012 08:53:03 -0400 Received: from eggs.gnu.org ([208.118.235.92]:39442) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SLDKX-0002l1-5Y for qemu-devel@nongnu.org; Fri, 20 Apr 2012 08:52:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SLDKR-000576-Kb for qemu-devel@nongnu.org; Fri, 20 Apr 2012 08:52:52 -0400 Received: from e06smtp17.uk.ibm.com ([195.75.94.113]:50764) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SLDKR-00051U-Br for qemu-devel@nongnu.org; Fri, 20 Apr 2012 08:52:47 -0400 Received: from /spool/local by e06smtp17.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 20 Apr 2012 13:52:43 +0100 Received: from d06nrmr1407.portsmouth.uk.ibm.com (9.149.38.185) by e06smtp17.uk.ibm.com (192.168.101.147) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 20 Apr 2012 13:52:42 +0100 Received: from d06av02.portsmouth.uk.ibm.com (d06av02.portsmouth.uk.ibm.com [9.149.37.228]) by d06nrmr1407.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q3KCqfTP2609204 for ; Fri, 20 Apr 2012 13:52:41 +0100 Received: from d06av02.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av02.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q3KCqet5009118 for ; Fri, 20 Apr 2012 06:52:41 -0600 Received: from localhost (dyn-9-174-218-67.manchester-maybrook.uk.ibm.com [9.174.218.67]) by d06av02.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q3KCqeot009113; Fri, 20 Apr 2012 06:52:40 -0600 From: Stefan Hajnoczi To: Anthony Liguori Date: Fri, 20 Apr 2012 13:52:33 +0100 Message-Id: <1334926356-7807-5-git-send-email-stefanha@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1334926356-7807-1-git-send-email-stefanha@linux.vnet.ibm.com> References: <1334926356-7807-1-git-send-email-stefanha@linux.vnet.ibm.com> MIME-Version: 1.0 x-cbid: 12042012-0542-0000-0000-00000199BE3D X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 195.75.94.113 Cc: qemu-devel@nongnu.org, =?UTF-8?q?Eric=20B=C3=A9nard?= , Stefan Hajnoczi Subject: [Qemu-devel] [PATCH 4/7] pflash_cfi01: remove redundant line 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 From: Eric Bénard Signed-off-by: Eric Bénard Reviewed-by: Peter Maydell Signed-off-by: Stefan Hajnoczi --- hw/pflash_cfi01.c | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/pflash_cfi01.c b/hw/pflash_cfi01.c index b03f623..d1c7423 100644 --- a/hw/pflash_cfi01.c +++ b/hw/pflash_cfi01.c @@ -144,7 +144,6 @@ static uint32_t pflash_read (pflash_t *pfl, target_phys_addr_t offset, } else { ret = p[offset]; ret |= p[offset + 1] << 8; - ret |= p[offset + 1] << 8; ret |= p[offset + 2] << 16; ret |= p[offset + 3] << 24; }