leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

POST: drivers/memory.c coding style cleanup

Browse Source 
This is needed for a further patch adding a new memory test.

Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>
Acked-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Valentin Longchamp 2011-08-03 02:37:03 +00:00 committed by Wolfgang Denk
parent 212a0cafad
commit ca51d05758
1 changed files with 57 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
post/drivers/memory.c
View File

@ -306,7 +306,7 @@ static int memory_post_test1 (unsigned long start,
WATCHDOG_RESET();
}
for (i = 0; i < size / sizeof (ulong) && ret == 0; i++) {
for (i = 0; i < size / sizeof (ulong) && !ret; i++) {
readback = mem[i];
if (readback != val) {
post_log("Memory error at %08x, "
@ -336,7 +336,7 @@ static int memory_post_test2 (unsigned long start, unsigned long size)
WATCHDOG_RESET();
}
for (i = 0; i < size / sizeof (ulong) && ret == 0; i++) {
for (i = 0; i < size / sizeof (ulong) && !ret; i++) {
readback = mem[i];
if (readback != (1 << (i % 32))) {
post_log("Memory error at %08x, "
@ -366,7 +366,7 @@ static int memory_post_test3 (unsigned long start, unsigned long size)
WATCHDOG_RESET();
}
for (i = 0; i < size / sizeof (ulong) && ret == 0; i++) {
for (i = 0; i < size / sizeof (ulong) && !ret; i++) {
readback = mem[i];
if (readback != i) {
post_log("Memory error at %08x, "
@ -396,7 +396,7 @@ static int memory_post_test4 (unsigned long start, unsigned long size)
WATCHDOG_RESET();
}
for (i = 0; i < size / sizeof (ulong) && ret == 0; i++) {
for (i = 0; i < size / sizeof (ulong) && !ret; i++) {
readback = mem[i];
if (readback != ~i) {
post_log("Memory error at %08x, "
@ -417,35 +417,36 @@ static int memory_post_tests (unsigned long start, unsigned long size)
{
int ret = 0;
if (ret == 0)
if (!ret)
ret = memory_post_dataline((unsigned long long *)start);
WATCHDOG_RESET();
if (ret == 0)
ret = memory_post_addrline ((ulong *)start, (ulong *)start, size);
if (!ret)
ret = memory_post_addrline((ulong *)start, (ulong *)start,
size);
WATCHDOG_RESET();
if (ret == 0)
if (!ret)
ret = memory_post_addrline((ulong *)(start + size - 8),
(ulong *)start, size);
WATCHDOG_RESET();
if (ret == 0)
if (!ret)
ret = memory_post_test1(start, size, 0x00000000);
WATCHDOG_RESET();
if (ret == 0)
if (!ret)
ret = memory_post_test1(start, size, 0xffffffff);
WATCHDOG_RESET();
if (ret == 0)
if (!ret)
ret = memory_post_test1(start, size, 0x55555555);
WATCHDOG_RESET();
if (ret == 0)
if (!ret)
ret = memory_post_test1(start, size, 0xaaaaaaaa);
WATCHDOG_RESET();
if (ret == 0)
if (!ret)
ret = memory_post_test2(start, size);
WATCHDOG_RESET();
if (ret == 0)
if (!ret)
ret = memory_post_test3(start, size);
WATCHDOG_RESET();
if (ret == 0)
if (!ret)
ret = memory_post_test4(start, size);
WATCHDOG_RESET();
@ -502,11 +503,11 @@ int memory_post_test(int flags)
ret = memory_post_tests(vstart, memsize);
} else { /* POST_NORMAL */
unsigned long i;
for (i = 0; i < (memsize >> 20) && ret == 0; i++) {
if (ret == 0)
for (i = 0; i < (memsize >> 20) && !ret; i++) {
if (!ret)
ret = memory_post_tests(vstart +
(i << 20), 0x800);
if (ret == 0)
if (!ret)
ret = memory_post_tests(vstart +
(i << 20) + 0xff800, 0x800);
}