From 53504a278900939e197d8c35164c27ffee861691 Mon Sep 17 00:00:00 2001 From: Scott Wood Date: Mon, 12 Jul 2010 18:17:40 -0500 Subject: NAND: formatting cleanups from env.oob support Change if (ok) { bunch of stuff } else { error } to if (error) { get out } proceed with bunch of stuff Plus a few whitespace cleanups. Signed-off-by: Scott Wood --- common/env_nand.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) (limited to 'common/env_nand.c') diff --git a/common/env_nand.c b/common/env_nand.c index 47d9848..a5e1038 100644 --- a/common/env_nand.c +++ b/common/env_nand.c @@ -299,23 +299,21 @@ int get_nand_env_oob(nand_info_t *nand, unsigned long *result) ops.oobbuf = (void *) oob_buf; ret = nand->read_oob(nand, ENV_OFFSET_SIZE, &ops); + if (ret) { + printf("error reading OOB block 0\n"); + return ret; + } - if (!ret) { - if (oob_buf[0] == ENV_OOB_MARKER) { - *result = oob_buf[1] * nand->erasesize; - } else if (oob_buf[0] == ENV_OOB_MARKER_OLD) { - *result = oob_buf[1]; - } else { - printf("No dynamic environment marker in OOB block 0" - "\n"); - ret = -ENOENT; - goto fail; - } + if (oob_buf[0] == ENV_OOB_MARKER) { + *result = oob_buf[1] * nand->erasesize; + } else if (oob_buf[0] == ENV_OOB_MARKER_OLD) { + *result = oob_buf[1]; } else { - printf("error reading OOB block 0\n"); + printf("No dynamic environment marker in OOB block 0\n"); + return -ENOENT; } -fail: - return ret; + + return 0; } #endif -- cgit v1.1