leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cbfs: Simplify file iteration

Browse Source 
In file_cbfs_next_file() there is a lot of complicated code to move to
the next file. Use the ALIGN() macros to simplify this.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2021-03-15 18:00:15 +13:00
parent 70a394a6b6
commit 0e2fee52d0
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fs/cbfs/cbfs.c
View File

@ -133,7 +133,6 @@ static int file_cbfs_next_file(struct cbfs_priv *priv, void *start, int size,
while (size >= align) {
const struct cbfs_fileheader *file_header = start;
u32 step;
int ret;
/* Check if there's a file here. */
@ -152,11 +151,7 @@ static int file_cbfs_next_file(struct cbfs_priv *priv, void *start, int size,
return log_msg_ret("fill", ret);
}
step = header.len;
if (step % align)
step = step + align - step % align;
*used += step;
*used += ALIGN(header.len, align);
return 0;
}