Commit 53504a278900939e197d8c35164c27ffee861691
1 parent
c9f7351b5b
Exists in
master
and in
54 other branches
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 <scottwood@freescale.com>
Showing 2 changed files with 40 additions and 40 deletions Side-by-side Diff
common/cmd_nand.c
| ... | ... | @@ -201,7 +201,7 @@ |
| 201 | 201 | unsigned long nand_env_oob_offset; |
| 202 | 202 | |
| 203 | 203 | int do_nand_env_oob(cmd_tbl_t *cmdtp, nand_info_t *nand, |
| 204 | - int argc, char * const argv[]) | |
| 204 | + int argc, char * const argv[]) | |
| 205 | 205 | { |
| 206 | 206 | int ret; |
| 207 | 207 | uint32_t oob_buf[ENV_OFFSET_SIZE/sizeof(uint32_t)]; |
| 208 | 208 | |
| ... | ... | @@ -210,10 +210,10 @@ |
| 210 | 210 | |
| 211 | 211 | if (!strcmp(cmd, "get")) { |
| 212 | 212 | ret = get_nand_env_oob(nand, &nand_env_oob_offset); |
| 213 | - if (!ret) | |
| 214 | - printf("0x%08lx\n", nand_env_oob_offset); | |
| 215 | - else | |
| 213 | + if (ret) | |
| 216 | 214 | return 1; |
| 215 | + | |
| 216 | + printf("0x%08lx\n", nand_env_oob_offset); | |
| 217 | 217 | } else if (!strcmp(cmd, "set")) { |
| 218 | 218 | ulong addr; |
| 219 | 219 | size_t dummy_size; |
| 220 | 220 | |
| ... | ... | @@ -222,17 +222,17 @@ |
| 222 | 222 | if (argc < 3) |
| 223 | 223 | goto usage; |
| 224 | 224 | |
| 225 | - if (arg_off_size(argc-2, argv + 2, nand, &addr, | |
| 226 | - &dummy_size) < 0) { | |
| 225 | + if (arg_off_size(argc - 2, argv + 2, nand, &addr, | |
| 226 | + &dummy_size) < 0) { | |
| 227 | 227 | printf("Offset or partition name expected\n"); |
| 228 | 228 | return 1; |
| 229 | 229 | } |
| 230 | 230 | |
| 231 | 231 | if (nand->oobavail < ENV_OFFSET_SIZE) { |
| 232 | - printf("Insufficient available OOB bytes: %d OOB bytes" | |
| 233 | - " available but %d required for env.oob support\n", | |
| 234 | - nand->oobavail, | |
| 235 | - ENV_OFFSET_SIZE); | |
| 232 | + printf("Insufficient available OOB bytes:\n" | |
| 233 | + "%d OOB bytes available but %d required for " | |
| 234 | + "env.oob support\n", | |
| 235 | + nand->oobavail, ENV_OFFSET_SIZE); | |
| 236 | 236 | return 1; |
| 237 | 237 | } |
| 238 | 238 | |
| 239 | 239 | |
| ... | ... | @@ -251,23 +251,23 @@ |
| 251 | 251 | oob_buf[1] = addr / nand->erasesize; |
| 252 | 252 | |
| 253 | 253 | ret = nand->write_oob(nand, ENV_OFFSET_SIZE, &ops); |
| 254 | - if (!ret) { | |
| 255 | - ret = get_nand_env_oob(nand, &nand_env_oob_offset); | |
| 256 | - if (ret) { | |
| 257 | - printf("Error reading env offset in OOB\n"); | |
| 258 | - return ret; | |
| 259 | - } | |
| 260 | - | |
| 261 | - if (addr != nand_env_oob_offset) { | |
| 262 | - printf("Verification of env offset in OOB " | |
| 263 | - "failed: 0x%08lx expected but got " | |
| 264 | - "0x%08lx\n", addr, nand_env_oob_offset); | |
| 265 | - return 1; | |
| 266 | - } | |
| 267 | - } else { | |
| 254 | + if (ret) { | |
| 268 | 255 | printf("Error writing OOB block 0\n"); |
| 269 | 256 | return ret; |
| 270 | 257 | } |
| 258 | + | |
| 259 | + ret = get_nand_env_oob(nand, &nand_env_oob_offset); | |
| 260 | + if (ret) { | |
| 261 | + printf("Error reading env offset in OOB\n"); | |
| 262 | + return ret; | |
| 263 | + } | |
| 264 | + | |
| 265 | + if (addr != nand_env_oob_offset) { | |
| 266 | + printf("Verification of env offset in OOB failed: " | |
| 267 | + "0x%08lx expected but got 0x%08lx\n", | |
| 268 | + addr, nand_env_oob_offset); | |
| 269 | + return 1; | |
| 270 | + } | |
| 271 | 271 | } else { |
| 272 | 272 | goto usage; |
| 273 | 273 | } |
| ... | ... | @@ -369,8 +369,10 @@ |
| 369 | 369 | |
| 370 | 370 | #ifdef CONFIG_ENV_OFFSET_OOB |
| 371 | 371 | /* this command operates only on the first nand device */ |
| 372 | - if (strcmp(cmd, "env.oob") == 0) | |
| 373 | - return do_nand_env_oob(cmdtp, &nand_info[0], argc - 1, argv + 1); | |
| 372 | + if (strcmp(cmd, "env.oob") == 0) { | |
| 373 | + return do_nand_env_oob(cmdtp, &nand_info[0], | |
| 374 | + argc - 1, argv + 1); | |
| 375 | + } | |
| 374 | 376 | #endif |
| 375 | 377 | |
| 376 | 378 | /* the following commands operate on the current device */ |
common/env_nand.c
| ... | ... | @@ -299,23 +299,21 @@ |
| 299 | 299 | ops.oobbuf = (void *) oob_buf; |
| 300 | 300 | |
| 301 | 301 | ret = nand->read_oob(nand, ENV_OFFSET_SIZE, &ops); |
| 302 | + if (ret) { | |
| 303 | + printf("error reading OOB block 0\n"); | |
| 304 | + return ret; | |
| 305 | + } | |
| 302 | 306 | |
| 303 | - if (!ret) { | |
| 304 | - if (oob_buf[0] == ENV_OOB_MARKER) { | |
| 305 | - *result = oob_buf[1] * nand->erasesize; | |
| 306 | - } else if (oob_buf[0] == ENV_OOB_MARKER_OLD) { | |
| 307 | - *result = oob_buf[1]; | |
| 308 | - } else { | |
| 309 | - printf("No dynamic environment marker in OOB block 0" | |
| 310 | - "\n"); | |
| 311 | - ret = -ENOENT; | |
| 312 | - goto fail; | |
| 313 | - } | |
| 307 | + if (oob_buf[0] == ENV_OOB_MARKER) { | |
| 308 | + *result = oob_buf[1] * nand->erasesize; | |
| 309 | + } else if (oob_buf[0] == ENV_OOB_MARKER_OLD) { | |
| 310 | + *result = oob_buf[1]; | |
| 314 | 311 | } else { |
| 315 | - printf("error reading OOB block 0\n"); | |
| 312 | + printf("No dynamic environment marker in OOB block 0\n"); | |
| 313 | + return -ENOENT; | |
| 316 | 314 | } |
| 317 | -fail: | |
| 318 | - return ret; | |
| 315 | + | |
| 316 | + return 0; | |
| 319 | 317 | } |
| 320 | 318 | #endif |
| 321 | 319 |