From c61d4d25511306cbf0e8175bfb0dd16cd90a9b3e Mon Sep 17 00:00:00 2001 From: Alexandru Gagniuc Date: Mon, 16 May 2016 16:06:07 -0700 Subject: [PATCH] UPSTREAM: lib/timestamp: Do not initialize cache in timestamp_cache_get() timestamp_cache_get() would call timestamp_cache_init() whenever it found a timestamp cache in the TIMESTAMP_CACHE_UNINITIALIZED state. That means that timestamp_cache_get() will never reurn a cache in the uninitialized state. However, timestamp_init() checks against the uninitialized state, as it does not expect timestamp_cache_get() to perform any initialization. As a result, the conditional branch can never be reached. Simply remove the timestamp_cache_init() call from timestamp_cache_get(). BUG=None BRANCH=None TEST=None Change-Id: I573ffbf948b69948a3b383fa3bc94382f205b8f8 Original-Signed-off-by: Alexandru Gagniuc Original-Reviewed-on: https://review.coreboot.org/14861 Original-Tested-by: build bot (Jenkins) Original-Reviewed-by: Aaron Durbin Original-Reviewed-by: Furquan Shaikh Signed-off-by: Aaron Durbin Reviewed-on: https://chromium-review.googlesource.com/346789 Commit-Ready: Martin Roth Tested-by: Martin Roth Reviewed-by: Martin Roth --- src/lib/timestamp.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/lib/timestamp.c b/src/lib/timestamp.c index ae84c4f673..372076c42d 100644 --- a/src/lib/timestamp.c +++ b/src/lib/timestamp.c @@ -86,9 +86,6 @@ static struct timestamp_cache *timestamp_cache_get(void) ts_cache = car_get_var_ptr((void *)_timestamp); } - if (ts_cache && ts_cache->cache_state == TIMESTAMP_CACHE_UNINITIALIZED) - timestamp_cache_init(ts_cache, 0); - return ts_cache; }