Commit 9dbaebcf9f401c5dcea762e34a3dc8ed10760623
Committed by
Stefan Roese
Stefan Roese
1 parent
c8a9a82c10
Exists in
smarc_8mq_lf_v2020.04
and in
17 other branches
flash: Fix spelling of "ERR_TIMOUT"
checkpatch.pl complains about the spelling of ERR_TIMOUT. Since the error is only used in a handful of files, we rename the error to ERR_TIMEOUT. Signed-off-by: Mario Six <mario.six@gdsys.cc> Signed-off-by: Stefan Roese <sr@denx.de>
Showing 5 changed files with 9 additions and 9 deletions Side-by-side Diff
board/cobra5272/flash.c
common/flash.c
| ... | ... | @@ -112,7 +112,7 @@ |
| 112 | 112 | * and no protected sectors are hit. |
| 113 | 113 | * Returns: |
| 114 | 114 | * ERR_OK 0 - OK |
| 115 | - * ERR_TIMOUT 1 - write timeout | |
| 115 | + * ERR_TIMEOUT 1 - write timeout | |
| 116 | 116 | * ERR_NOT_ERASED 2 - Flash not erased |
| 117 | 117 | * ERR_PROTECTED 4 - target range includes protected sectors |
| 118 | 118 | * ERR_INVAL 8 - target address not in Flash memory |
| ... | ... | @@ -185,7 +185,7 @@ |
| 185 | 185 | switch (err) { |
| 186 | 186 | case ERR_OK: |
| 187 | 187 | break; |
| 188 | - case ERR_TIMOUT: | |
| 188 | + case ERR_TIMEOUT: | |
| 189 | 189 | puts ("Timeout writing to Flash\n"); |
| 190 | 190 | break; |
| 191 | 191 | case ERR_NOT_ERASED: |
drivers/mtd/cfi_flash.c
| ... | ... | @@ -588,7 +588,7 @@ |
| 588 | 588 | flash_read_long(info, sector, 0)); |
| 589 | 589 | flash_write_cmd(info, sector, 0, info->cmd_reset); |
| 590 | 590 | udelay(1); |
| 591 | - return ERR_TIMOUT; | |
| 591 | + return ERR_TIMEOUT; | |
| 592 | 592 | } |
| 593 | 593 | udelay(1); /* also triggers watchdog */ |
| 594 | 594 | } |
| ... | ... | @@ -696,7 +696,7 @@ |
| 696 | 696 | if (get_timer(start) > tout) { |
| 697 | 697 | printf("Flash %s timeout at address %lx data %lx\n", |
| 698 | 698 | prompt, (ulong)dst, (ulong)flash_read8(dst)); |
| 699 | - return ERR_TIMOUT; | |
| 699 | + return ERR_TIMEOUT; | |
| 700 | 700 | } |
| 701 | 701 | udelay(1); /* also triggers watchdog */ |
| 702 | 702 | } |
drivers/mtd/pic32_flash.c
| ... | ... | @@ -69,7 +69,7 @@ |
| 69 | 69 | int ret = wait_for_bit_le32(&nvm_regs_p->ctrl.raw, |
| 70 | 70 | NVM_WR, false, timeout, false); |
| 71 | 71 | |
| 72 | - return ret ? ERR_TIMOUT : ERR_OK; | |
| 72 | + return ret ? ERR_TIMEOUT : ERR_OK; | |
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | static inline int flash_complete_operation(void) |
| ... | ... | @@ -99,7 +99,7 @@ |
| 99 | 99 | * Erase flash sectors, returns: |
| 100 | 100 | * ERR_OK - OK |
| 101 | 101 | * ERR_INVAL - invalid sector arguments |
| 102 | - * ERR_TIMOUT - write timeout | |
| 102 | + * ERR_TIMEOUT - write timeout | |
| 103 | 103 | * ERR_NOT_ERASED - Flash not erased |
| 104 | 104 | * ERR_UNKNOWN_FLASH_VENDOR - incorrect flash |
| 105 | 105 | */ |
| ... | ... | @@ -217,7 +217,7 @@ |
| 217 | 217 | /* |
| 218 | 218 | * Copy memory to flash, returns: |
| 219 | 219 | * ERR_OK - OK |
| 220 | - * ERR_TIMOUT - write timeout | |
| 220 | + * ERR_TIMEOUT - write timeout | |
| 221 | 221 | * ERR_NOT_ERASED - Flash not erased |
| 222 | 222 | */ |
| 223 | 223 | int write_buff(flash_info_t *info, uchar *src, ulong addr, ulong cnt) |
include/flash.h