diff mbox

[PULL,07/23] omap_gpmc.c: Remove duplicate assignment

Message ID 1414150649-30428-8-git-send-email-peter.maydell@linaro.org
State Accepted
Commit 635117e71fc697824e82cc694ba4e44dda7a9216
Headers show

Commit Message

Peter Maydell Oct. 24, 2014, 11:37 a.m. UTC 
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>

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 <dgilbert@redhat.com>
Message-id: 1414055855-6688-1-git-send-email-dgilbert@redhat.com
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 hw/misc/omap_gpmc.c | 2 --
 1 file changed, 2 deletions(-)
diff mbox

Patch

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