* [Qemu-devel] [PATCH 1/1] omap_gpmc.c: Remove duplicate assignment
@ 2014-10-23 9:17 Dr. David Alan Gilbert (git)
2014-10-23 13:13 ` Peter Maydell
0 siblings, 1 reply; 2+ messages in thread
From: Dr. David Alan Gilbert (git) @ 2014-10-23 9:17 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, Julia.Lawall
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>
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Qemu-devel] [PATCH 1/1] omap_gpmc.c: Remove duplicate assignment
2014-10-23 9:17 [Qemu-devel] [PATCH 1/1] omap_gpmc.c: Remove duplicate assignment Dr. David Alan Gilbert (git)
@ 2014-10-23 13:13 ` Peter Maydell
0 siblings, 0 replies; 2+ messages in thread
From: Peter Maydell @ 2014-10-23 13:13 UTC (permalink / raw)
To: Dr. David Alan Gilbert (git); +Cc: Julia.Lawall, QEMU Developers
On 23 October 2014 10:17, Dr. David Alan Gilbert (git)
<dgilbert@redhat.com> wrote:
> 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>
> ---
> hw/misc/omap_gpmc.c | 2 --
> 1 file changed, 2 deletions(-)
Thanks, applied to target-arm.next.
-- PMM
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-10-23 13:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-23 9:17 [Qemu-devel] [PATCH 1/1] omap_gpmc.c: Remove duplicate assignment Dr. David Alan Gilbert (git)
2014-10-23 13:13 ` Peter Maydell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).