From 9730b2bd1fb6a3b7d5701740dbf4783eb8671ba4 Mon Sep 17 00:00:00 2001
From: Robert Baldyga <robert.baldyga@intel.com>
Date: Wed, 7 Aug 2019 16:12:06 +0200
Subject: [PATCH] Remove remaining core_id occurrences from public API

Signed-off-by: Robert Baldyga <robert.baldyga@intel.com>
---
 inc/ocf_core.h       | 21 ---------------------
 inc/ocf_trace.h      |  8 ++++----
 src/ocf_core_priv.h  |  2 ++
 src/ocf_trace.c      |  2 +-
 src/ocf_trace_priv.h |  2 +-
 5 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/inc/ocf_core.h b/inc/ocf_core.h
index 24db086..24b099c 100644
--- a/inc/ocf_core.h
+++ b/inc/ocf_core.h
@@ -86,15 +86,6 @@ uint32_t ocf_core_get_seq_cutoff_threshold(ocf_core_t core);
  */
 ocf_seq_cutoff_policy ocf_core_get_seq_cutoff_policy(ocf_core_t core);
 
-/**
- * @brief Get ID of given core object
- *
- * @param[in] core Core object
- *
- * @retval Core ID
- */
-ocf_core_id_t ocf_core_get_id(ocf_core_t core);
-
 /**
  * @brief Get name of given core object
  *
@@ -113,18 +104,6 @@ const char *ocf_core_get_name(ocf_core_t core);
  */
 ocf_core_state_t ocf_core_get_state(ocf_core_t core);
 
-/**
- * @brief Obtain core object of given ID from cache
- *
- * @param[in] cache Cache object
- * @param[in] id Core ID
- * @param[out] core Core object
- *
- * @retval 0 Success
- * @retval Non-zero Core getting failed
- */
-int ocf_core_get(ocf_cache_t cache, ocf_core_id_t id, ocf_core_t *core);
-
 /**
  * @brief Allocate new ocf_io
  *
diff --git a/inc/ocf_trace.h b/inc/ocf_trace.h
index 445cae2..4a0f613 100644
--- a/inc/ocf_trace.h
+++ b/inc/ocf_trace.h
@@ -85,8 +85,8 @@ struct ocf_event_core_desc {
 	/** Event header */
 	struct ocf_event_hdr hdr;
 
-	/** Core Id */
-	ocf_core_id_t id;
+	/** Core name */
+	const char *name;
 
 	/** Core size in bytes */
 	uint64_t core_size;
@@ -123,8 +123,8 @@ struct ocf_event_io {
 	/** IO class of IO */
 	uint32_t io_class;
 
-	/** Core ID */
-	ocf_core_id_t core_id;
+	/** Core name */
+	const char *core_name;
 
 	/** Operation type: read, write, trim or flush **/
 	ocf_event_operation_t operation;
diff --git a/src/ocf_core_priv.h b/src/ocf_core_priv.h
index 7c6c460..5f68eb8 100644
--- a/src/ocf_core_priv.h
+++ b/src/ocf_core_priv.h
@@ -95,6 +95,8 @@ struct ocf_core {
 
 bool ocf_core_is_valid(ocf_cache_t cache, ocf_core_id_t id);
 
+ocf_core_id_t ocf_core_get_id(ocf_core_t core);
+
 int ocf_core_volume_type_init(ocf_ctx_t ctx);
 
 #endif /* __OCF_CORE_PRIV_H__ */
diff --git a/src/ocf_trace.c b/src/ocf_trace.c
index 334d9e4..e85c51e 100644
--- a/src/ocf_trace.c
+++ b/src/ocf_trace.c
@@ -27,7 +27,7 @@ static int _ocf_core_desc(ocf_core_t core, void  *ctx)
 			ocf_trace_seq_id(cache),
 			env_ticks_to_nsecs(env_get_tick_count()),
 			sizeof(core_desc));
-	core_desc.id = ocf_core_get_id(core);
+	core_desc.name = ocf_core_get_name(core);
 	core_desc.core_size = ocf_volume_get_length(
 			ocf_core_get_volume(core));
 
diff --git a/src/ocf_trace_priv.h b/src/ocf_trace_priv.h
index e45e69d..179ff68 100644
--- a/src/ocf_trace_priv.h
+++ b/src/ocf_trace_priv.h
@@ -59,7 +59,7 @@ static inline void ocf_trace_prep_io_event(struct ocf_event_io *ev,
 		ev->len = req->byte_length;
 
 	ev->operation = op;
-	ev->core_id = ocf_core_get_id(req->core);
+	ev->core_name = ocf_core_get_name(req->core);
 
 	ev->io_class = req->ioi.io.io_class;
 }