Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-05-03 10:17:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

cfi_flash: Remove assignments from if conditions

Browse source 
The condition in if statements should not be used for variable
assignment. Instead, the assignment should be done in a separate step
beforehand. Fix all instances where this occurs.

Signed-off-by: Mario Six <mario.six@gdsys.cc>
Signed-off-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Mario Six 2018-01-26 14:43:48 +01:00 • committed by Stefan Roese
parent ab61cfb857
commit d3525b6bb0
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
drivers/mtd/cfi_flash.c
View file

@ -1339,7 +1339,8 @@ int write_buff(flash_info_t *info, uchar *src, ulong addr, ulong cnt)
wp = (addr & ~(info->portwidth - 1)); wp = (addr & ~(info->portwidth - 1));
/* handle unaligned start */ /* handle unaligned start */
if ((aln = addr - wp) != 0) { aln = addr - wp;
if (aln != 0) {
cword.w32 = 0; cword.w32 = 0;
p = (uchar *)wp; p = (uchar *)wp;
for (i = 0; i < aln; ++i) for (i = 0; i < aln; ++i)
@ -1370,7 +1371,8 @@ int write_buff(flash_info_t *info, uchar *src, ulong addr, ulong cnt)
cword.w32 = 0; cword.w32 = 0;
for (i = 0; i < info->portwidth; i++) for (i = 0; i < info->portwidth; i++)
flash_add_byte(info, &cword, *src++); flash_add_byte(info, &cword, *src++);
if ((rc = flash_write_cfiword(info, wp, cword)) != 0) rc = flash_write_cfiword(info, wp, cword);
if (rc != 0)
return rc; return rc;
wp += info->portwidth; wp += info->portwidth;
cnt -= info->portwidth; cnt -= info->portwidth;
@ -1381,7 +1383,8 @@ int write_buff(flash_info_t *info, uchar *src, ulong addr, ulong cnt)
i = buffered_size - (wp % buffered_size); i = buffered_size - (wp % buffered_size);
if (i > cnt) if (i > cnt)
i = cnt; i = cnt;
if ((rc = flash_write_cfibuffer(info, wp, src, i)) != ERR_OK) rc = flash_write_cfibuffer(info, wp, src, i);
if (rc != ERR_OK)
return rc; return rc;
i -= i & (info->portwidth - 1); i -= i & (info->portwidth - 1);
wp += i; wp += i;
@ -1397,7 +1400,8 @@ int write_buff(flash_info_t *info, uchar *src, ulong addr, ulong cnt)
cword.w32 = 0; cword.w32 = 0;
for (i = 0; i < info->portwidth; i++) for (i = 0; i < info->portwidth; i++)
flash_add_byte(info, &cword, *src++); flash_add_byte(info, &cword, *src++);
if ((rc = flash_write_cfiword(info, wp, cword)) != 0) rc = flash_write_cfiword(info, wp, cword);
if (rc != 0)
return rc; return rc;
wp += info->portwidth; wp += info->portwidth;
cnt -= info->portwidth; cnt -= info->portwidth;
@ -1569,9 +1573,9 @@ int flash_real_protect(flash_info_t *info, long sector, int prot)
* flash_full_status_check() to work correctly * flash_full_status_check() to work correctly
*/ */
flash_write_cmd(info, sector, 0, FLASH_CMD_READ_STATUS); flash_write_cmd(info, sector, 0, FLASH_CMD_READ_STATUS);
if ((retcode = retcode = flash_full_status_check(info, sector, info->erase_blk_tout,
flash_full_status_check(info, sector, info->erase_blk_tout, prot ? "protect" : "unprotect");
prot ? "protect" : "unprotect")) == 0) { if (retcode == 0) {
info->protect[sector] = prot; info->protect[sector] = prot;
/* /*