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>
diff --git a/board/cobra5272/flash.c b/board/cobra5272/flash.c
index 4fac688..ca27b49 100644
--- a/board/cobra5272/flash.c
+++ b/board/cobra5272/flash.c
@@ -216,7 +216,7 @@
goto outahere;
}
if (chip1 == TMO) {
- rc = ERR_TIMOUT;
+ rc = ERR_TIMEOUT;
goto outahere;
}
diff --git a/common/flash.c b/common/flash.c
index 587ef60..8766774 100644
--- a/common/flash.c
+++ b/common/flash.c
@@ -112,7 +112,7 @@
* 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 @@
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 e94a726..5ba0c5f 100644
--- a/drivers/mtd/cfi_flash.c
+++ b/drivers/mtd/cfi_flash.c
@@ -588,7 +588,7 @@
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 */
}
@@ -696,7 +696,7 @@
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/pic32_flash.c b/drivers/mtd/pic32_flash.c
index 8bbf2fa..d908387 100644
--- a/drivers/mtd/pic32_flash.c
+++ b/drivers/mtd/pic32_flash.c
@@ -69,7 +69,7 @@
int ret = wait_for_bit_le32(&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 @@
* 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 @@
/*
* 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/flash.h b/include/flash.h
index dc67cb2..1a4e879 100644
--- a/include/flash.h
+++ b/include/flash.h
@@ -122,7 +122,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