[PATCH 13/13] cbfs: Don't require the CBFS size with cbfs_init_mem()

[Simon Glass]

The size is not actually used since it is present in the header. Drop this
parameter. Also tidy up error handling while we are here.

Signed-off-by: Simon Glass <s...@chromium.org>
---

 arch/x86/lib/fsp2/fsp_init.c | 3 +--
 fs/cbfs/cbfs.c               | 9 +++++----
 include/cbfs.h               | 3 +--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/arch/x86/lib/fsp2/fsp_init.c b/arch/x86/lib/fsp2/fsp_init.c
index c7dc2ea257..668a4aa723 100644
--- a/arch/x86/lib/fsp2/fsp_init.c
+++ b/arch/x86/lib/fsp2/fsp_init.c
@@ -79,11 +79,10 @@ static int get_cbfs_fsp(enum fsp_type_t type, ulong 
map_base,
         * 'COREBOOT' (CBFS, size 1814528, offset 2117632).
         */
        ulong cbfs_base = 0x205000;
-       ulong cbfs_size = 0x1bb000;
        struct cbfs_priv *cbfs;
        int ret;
 
-       ret = cbfs_init_mem(map_base + cbfs_base, cbfs_size, &cbfs);
+       ret = cbfs_init_mem(map_base + cbfs_base, &cbfs);
        if (ret)
                return ret;
        if (!ret) {
diff --git a/fs/cbfs/cbfs.c b/fs/cbfs/cbfs.c
index 1603409a8f..30cd58f5ad 100644
--- a/fs/cbfs/cbfs.c
+++ b/fs/cbfs/cbfs.c
@@ -275,7 +275,7 @@ int file_cbfs_init(ulong end_of_rom)
        return cbfs_init(&cbfs_s, end_of_rom);
 }
 
-int cbfs_init_mem(ulong base, ulong size, struct cbfs_priv **privp)
+int cbfs_init_mem(ulong base, struct cbfs_priv **privp)
 {
        struct cbfs_priv priv_s, *priv = &priv_s;
        int ret;
@@ -288,9 +288,10 @@ int cbfs_init_mem(ulong base, ulong size, struct cbfs_priv 
**privp)
        if (ret)
                return ret;
 
-       file_cbfs_fill_cache(priv, priv->header.rom_size, priv->header.align);
-       if (priv->result != CBFS_SUCCESS)
-               return -EINVAL;
+       ret = file_cbfs_fill_cache(priv, priv->header.rom_size,
+                                  priv->header.align);
+       if (ret)
+               return log_msg_ret("fill", ret);
 
        priv->initialised = true;
        priv = malloc(sizeof(priv_s));
diff --git a/include/cbfs.h b/include/cbfs.h
index b1a8d2cad2..70f3b7a17b 100644
--- a/include/cbfs.h
+++ b/include/cbfs.h
@@ -151,11 +151,10 @@ const struct cbfs_cachenode *cbfs_find_file(struct 
cbfs_priv *cbfs,
  * cbfs_init_mem() - Set up a new CBFS
  *
  * @base: Base address of CBFS
- * @size: Size of CBFS in bytes
  * @cbfsp: Returns a pointer to CBFS on success
  * @return 0 if OK, -ve on error
  */
-int cbfs_init_mem(ulong base, ulong size, struct cbfs_priv **privp);
+int cbfs_init_mem(ulong base, struct cbfs_priv **privp);
 
 
 /***************************************************************************/
-- 
2.26.2.645.ge9eca65c58-goog