From d1443aa60bfab1e00523731f20608f4cae04193b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Sat, 4 Jan 2014 08:46:32 +0200 Subject: [PATCH] CBMEM: Rename cbmem_reinit() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This function does not really initialize anything, but only checks for the TOC. Change-Id: I9d100d1823a0b630f5d1175e42a6a15f45266de4 Signed-off-by: Kyösti Mälkki Reviewed-on: http://review.coreboot.org/4669 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- src/include/cbmem.h | 2 -- src/lib/cbmem.c | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/include/cbmem.h b/src/include/cbmem.h index eff18956cc..9e894a9494 100644 --- a/src/include/cbmem.h +++ b/src/include/cbmem.h @@ -145,8 +145,6 @@ void backup_top_of_ram(uint64_t ramtop); void cbmem_late_set_table(uint64_t base, uint64_t size); #endif -int cbmem_reinit(void); - void get_cbmem_table(uint64_t *base, uint64_t *size); struct cbmem_entry *get_cbmem_toc(void); diff --git a/src/lib/cbmem.c b/src/lib/cbmem.c index 05f195a43b..d97f6afdb0 100644 --- a/src/lib/cbmem.c +++ b/src/lib/cbmem.c @@ -119,7 +119,7 @@ static void cbmem_initialize_empty(void) }; } -int cbmem_reinit(void) +static int cbmem_check_toc(void) { uint64_t baseaddr, size; struct cbmem_entry *cbmem_toc; @@ -220,7 +220,7 @@ void *cbmem_find(u32 id) /* Returns True if it was not initialized before. */ int cbmem_recovery(int is_wakeup) { - int found = cbmem_reinit(); + int found = cbmem_check_toc(); int wipe = 0; /* CBMEM TOC is wiped clean when we are not waking up from S3