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....@gdsys.cc>
---
board/cobra5272/flash.c | 2 +-
common/flash.c | 4 ++--
drivers/mtd/cfi_flash.c | 4 ++--
drivers/mtd/dataflash.c | 2 +-
drivers/mtd/pic32_flash.c | 6 +++---
include/dataflash.h | 2 +-
include/flash.h | 2 +-
7 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/board/cobra5272/flash.c b/board/cobra5272/flash.c
index 4fac6880f1..ca27b49a3b 100644
--- a/board/cobra5272/flash.c
+++ b/board/cobra5272/flash.c
@@ -216,7 +216,7 @@ int flash_erase (flash_info_t * info, int s_first, int
s_last)
goto outahere;
}
if (chip1 == TMO) {
- rc = ERR_TIMOUT;
+ rc = ERR_TIMEOUT;
goto outahere;
}
diff --git a/common/flash.c b/common/flash.c
index 587ef60158..876677493f 100644
--- a/common/flash.c
+++ b/common/flash.c
@@ -112,7 +112,7 @@ addr2info (ulong addr)
* and no protected sectors are hit.
* Returns:
* ERR_OK 0 - OK
- * ERR_TIMOUT 1 - write timeout
+ * ERR_TIMEOUT 1 - write timeout
* ERR_NOT_ERASED 2 - Flash not erased
* ERR_PROTECTED 4 - target range includes protected sectors
* ERR_INVAL 8 - target address not in Flash memory
@@ -185,7 +185,7 @@ void flash_perror (int err)
switch (err) {
case ERR_OK:
break;
- case ERR_TIMOUT:
+ case ERR_TIMEOUT:
puts ("Timeout writing to Flash\n");
break;
case ERR_NOT_ERASED:
diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c
index dff8b73055..93bf9ed539 100644
--- a/drivers/mtd/cfi_flash.c
+++ b/drivers/mtd/cfi_flash.c
@@ -587,7 +587,7 @@ static int flash_status_check(flash_info_t *info,
flash_sect_t sector,
flash_read_long(info, sector, 0));
flash_write_cmd(info, sector, 0, info->cmd_reset);
udelay(1);
- return ERR_TIMOUT;
+ return ERR_TIMEOUT;
}
udelay(1); /* also triggers watchdog */
}
@@ -695,7 +695,7 @@ static int flash_status_poll(flash_info_t *info, void *src,
void *dst,
if (get_timer(start) > tout) {
printf("Flash %s timeout at address %lx data %lx\n",
prompt, (ulong)dst, (ulong)flash_read8(dst));
- return ERR_TIMOUT;
+ return ERR_TIMEOUT;
}
udelay(1); /* also triggers watchdog */
}
diff --git a/drivers/mtd/dataflash.c b/drivers/mtd/dataflash.c
index e961f518b0..09199ebeba 100644
--- a/drivers/mtd/dataflash.c
+++ b/drivers/mtd/dataflash.c
@@ -426,7 +426,7 @@ void dataflash_perror (int err)
switch (err) {
case ERR_OK:
break;
- case ERR_TIMOUT:
+ case ERR_TIMEOUT:
printf("Timeout writing to DataFlash\n");
break;
case ERR_PROTECTED:
diff --git a/drivers/mtd/pic32_flash.c b/drivers/mtd/pic32_flash.c
index e1a8d3bc4b..a6a5d1cc2e 100644
--- a/drivers/mtd/pic32_flash.c
+++ b/drivers/mtd/pic32_flash.c
@@ -69,7 +69,7 @@ static int flash_wait_till_busy(const char *func, ulong
timeout)
int ret = wait_for_bit(__func__, &nvm_regs_p->ctrl.raw,
NVM_WR, false, timeout, false);
- return ret ? ERR_TIMOUT : ERR_OK;
+ return ret ? ERR_TIMEOUT : ERR_OK;
}
static inline int flash_complete_operation(void)
@@ -99,7 +99,7 @@ static inline int flash_complete_operation(void)
* Erase flash sectors, returns:
* ERR_OK - OK
* ERR_INVAL - invalid sector arguments
- * ERR_TIMOUT - write timeout
+ * ERR_TIMEOUT - write timeout
* ERR_NOT_ERASED - Flash not erased
* ERR_UNKNOWN_FLASH_VENDOR - incorrect flash
*/
@@ -217,7 +217,7 @@ static int write_word(flash_info_t *info, ulong dest, ulong
word)
/*
* Copy memory to flash, returns:
* ERR_OK - OK
- * ERR_TIMOUT - write timeout
+ * ERR_TIMEOUT - write timeout
* ERR_NOT_ERASED - Flash not erased
*/
int write_buff(flash_info_t *info, uchar *src, ulong addr, ulong cnt)
diff --git a/include/dataflash.h b/include/dataflash.h
index c9f22200cf..68907251d1 100644
--- a/include/dataflash.h
+++ b/include/dataflash.h
@@ -29,7 +29,7 @@
* return codes from flash_write():
*/
# define ERR_OK 0
-# define ERR_TIMOUT 1
+# define ERR_TIMEOUT 1
# define ERR_NOT_ERASED 2
# define ERR_PROTECTED 4
# define ERR_INVAL 8
diff --git a/include/flash.h b/include/flash.h
index dc67cb2df6..1a4e879009 100644
--- a/include/flash.h
+++ b/include/flash.h
@@ -122,7 +122,7 @@ extern int jedec_flash_match(flash_info_t *info, ulong
base);
* return codes from flash_write():
*/
#define ERR_OK 0
-#define ERR_TIMOUT 1
+#define ERR_TIMEOUT 1
#define ERR_NOT_ERASED 2
#define ERR_PROTECTED 4
#define ERR_INVAL 8
--
2.11.0
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
