P9-XIP: simplify p9_xip_get_scalar()

Removing code duplication

Change-Id: I7708a9016c2a8679454c26df87dab350e7443df6
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/29765
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Richard J. Knight <rjknight@us.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
Reviewed-by: Martin Peschke <mpeschke@de.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/29774
Reviewed-by: Hostboot Team <hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

1 files changed, 6 insertions, 16 deletions

diff --git a/src/import/chips/p9/xip/p9_xip_image.c b/src/import/chips/p9/xip/p9_xip_image.c
index 0fc4dc481..8fa310d61 100644
--- a/src/import/chips/p9/xip/p9_xip_image.c
+++ b/src/import/chips/p9/xip/p9_xip_image.c
@@ -2165,22 +2165,6 @@ p9_xip_get_item(const P9XipItem* i_item, uint64_t* o_data, uint32_t i_index)
 }
 
 int
-p9_xip_get_scalar(void* i_image, const char* i_id, uint64_t* o_data)
-{
-    int rc;
-    P9XipItem item;
-
-    rc = p9_xip_find(i_image, i_id, &item);
-
-    if (!rc)
-    {
-        rc = p9_xip_get_item(&item, o_data, 0);
-    }
-
-    return rc;
-}
-
-int
 p9_xip_get_element(void* i_image,
                    const char* i_id,
                    const uint32_t i_index,
@@ -2201,6 +2185,12 @@ p9_xip_get_element(void* i_image,
 
 
 int
+p9_xip_get_scalar(void* i_image, const char* i_id, uint64_t* o_data)
+{
+    return p9_xip_get_element(i_image, i_id, 0, o_data);
+}
+
+int
 p9_xip_get_string(void* i_image, const char* i_id, char** o_data)
 {
     int rc;