From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43697) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XhEWi-0004EG-17 for qemu-devel@nongnu.org; Thu, 23 Oct 2014 05:17:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XhEWd-0006hs-3D for qemu-devel@nongnu.org; Thu, 23 Oct 2014 05:17:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42167) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XhEWc-0006hl-Rp for qemu-devel@nongnu.org; Thu, 23 Oct 2014 05:17:43 -0400 From: "Dr. David Alan Gilbert (git)" Date: Thu, 23 Oct 2014 10:17:35 +0100 Message-Id: <1414055855-6688-1-git-send-email-dgilbert@redhat.com> Subject: [Qemu-devel] [PATCH 1/1] omap_gpmc.c: Remove duplicate assignment List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Julia.Lawall@lip6.fr From: "Dr. David Alan Gilbert" This looks like an old merge error and should have no effect. (Build tested only) Found by Coccinelle using Julia Lawall's script: https://lkml.org/lkml/2014/8/23/128 Signed-off-by: Dr. David Alan Gilbert --- hw/misc/omap_gpmc.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/hw/misc/omap_gpmc.c b/hw/misc/omap_gpmc.c index fbbe2ff..a0de52f 100644 --- a/hw/misc/omap_gpmc.c +++ b/hw/misc/omap_gpmc.c @@ -466,8 +466,6 @@ void omap_gpmc_reset(struct omap_gpmc_s *s) s->cs_file[i].config[3] = 0x10031003; s->cs_file[i].config[4] = 0x10f1111; s->cs_file[i].config[5] = 0; - s->cs_file[i].config[6] = 0xf00 | (i ? 0 : 1 << 6); - s->cs_file[i].config[6] = 0xf00; /* In theory we could probe attached devices for some CFG1 * bits here, but we just retain them across resets as they -- 2.1.0