fix flash_get_info function
cover fix flash_get_info function
These series patch correct the behaviour of flash_get_info() function defined in drivers/mtd/cfi_flash.c
I separated a cosmetic change in the first patch.
Masahiro Yamada (2):
cosmetic: cfi_flash: delete a space after an unary operator
cfi_flash: return NULL for invalid base address input
drivers/mtd/cfi_flash.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
Signature · 1 line
1.7.9.5
PATCH 1/2 cosmetic: cfi_flash: delete a space after an unary operator
Linux Kernel Documentation/CodingStyle says:
Do not add a space after unary operators such as &, *, ...
--- drivers/mtd/cfi_flash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mtd/cfi_flash.c +1 -1
@@ -186,7 +186,7 @@ flash_info_t *flash_get_info(ulong base)flash_info_t *info =NULL ;for (i =0 ; i <CONFIG_SYS_MAX_FLASH_BANKS ; i++) { - info = & flash_info[i]; + info = &flash_info[i];if (info->size && info->start[0 ] <= base && base <= info->start[0 ] + info->size -1 )break ;
Signature · 1 line
1.7.9.5
PATCH 1/2 cosmetic: cfi_flash: delete a space after an unary operator
Quoted 2 lines · Masahiro Yamada
Linux Kernel
Documentation/CodingStylesays:
Do not add a space after unary operators such as &, *, ...
Applied to u-boot-cfi-flash/master.
Thanks,
Stefan
PATCH 2/2 cfi_flash: return NULL for invalid base address input
In reply to Masahiro YamadaWhen base address given was out of valid flash address ranges, flash_get_info() function returned the pointer to the last element of flash_info[i] array.
This patch changes this function to return NULL pointer in such a case, which is more correct behaviour.
The function flash_protect_default() calls flash_protect() immediately after flash_get_info() invocation. With this correction, flash_protect() function would be able to return soon, for NULL flash_info.
--- drivers/mtd/cfi_flash.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/mtd/cfi_flash.c +3 -3
@@ -183,16 +183,16 @@ u64 flash_read64(void *addr)__attribute__((weak, alias("__flash_read64")));flash_info_t *flash_get_info (ulong base) {int i; -flash_info_t *info =NULL ; +flash_info_t *info;for (i =0 ; i <CONFIG_SYS_MAX_FLASH_BANKS ; i++) { info = &flash_info[i];if (info->size && info->start[0 ] <= base && base <= info->start[0 ] + info->size -1 ) -break ; +return info; } -return info; +return NULL ; }#endif
Signature · 1 line
1.7.9.5
PATCH 2/2 cfi_flash: return NULL for invalid base address input
Quoted 11 lines · Masahiro Yamada
When base address given was out of valid flash address ranges,
flash_get_info()function returned the pointer to the last element of flash_info[i] array.This patch changes this function to return NULL pointer in such a case, which is more correct behaviour.
The function
flash_protect_default()callsflash_protect()immediately afterflash_get_info()invocation. With this correction,flash_protect()function would be able to return soon, for NULLflash_info.
Applied to u-boot-cfi-flash/master.
Thanks,
Stefan