Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-29 16:10:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

x86: Tidy up error handling in mrccache_save()

Browse source 
This function is a bit confusing at present due to the error handling.
Update it to remove the goto, returning errors as they happen.

While we are here, use hex for the data size since this is the norm in
U-Boot.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
Simon Glass 2019-12-06 21:42:06 -07:00 committed by Bin Meng
parent 37a508f8b7
commit 83f288f236
1 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
arch/x86/lib/mrccache.c
View file

@ -168,7 +168,7 @@ int mrccache_update(struct udevice *sf, struct mrc_region *entry,
cur);
if (ret) {
debug("Failed to write to SPI flash\n");
return ret;
return log_msg_ret("Cannot update mrccache", ret);
}
return 0;
@ -261,28 +261,23 @@ int mrccache_save(void)
if (!gd->arch.mrc_output_len)
return 0;
debug("Saving %d bytes of MRC output data to SPI flash\n",
debug("Saving %#x bytes of MRC output data to SPI flash\n",
gd->arch.mrc_output_len);
ret = mrccache_get_region(&sf, &entry);
if (ret)
goto err_entry;
return log_msg_ret("Cannot get region", ret);
ret = device_probe(sf);
if (ret)
goto err_entry;
return log_msg_ret("Cannot probe device", ret);
cache = gd->arch.mrc_cache;
ret = mrccache_update(sf, &entry, cache);
if (!ret) {
if (!ret)
debug("Saved MRC data with checksum %04x\n", cache->checksum);
} else if (ret == -EEXIST) {
else if (ret == -EEXIST)
debug("MRC data is the same as last time, skipping save\n");
ret = 0;
}
err_entry:
if (ret)
debug("%s: Failed: %d\n", __func__, ret);
return ret;
return 0;
}
int mrccache_spl_save(void)