summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDan Crowell <dcrowell@us.ibm.com>2016-04-01 15:08:02 -0500
committerStephen Cprek <smcprek@us.ibm.com>2016-04-21 13:51:15 -0500
commit37c82bbcff7e765cb82e9984b8355afdabc3d78f (patch)
tree483e931650bf34551171a15a810ceefdbc9c1ce9 /src
parent3ec4c55117b3c8e83917af465020e46049797ec3 (diff)
downloadtalos-hostboot-37c82bbcff7e765cb82e9984b8355afdabc3d78f.tar.gz
talos-hostboot-37c82bbcff7e765cb82e9984b8355afdabc3d78f.zip
Change return type for platGetFusedCoreMode
A change to the size of ReturnCode::iv_rc exposed a type mismatch in ATTR_FUSED_CORE_MODE_GETMACRO that was previously hidden due to favorable cast operators. Change-Id: Ie34bf0e163039c0adf461b2fa4d83f5e3e328d8f Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/22808 Tested-by: Jenkins Server Tested-by: FSP CI Jenkins Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com> Reviewed-by: Richard J. Knight <rjknight@us.ibm.com> Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src')
-rw-r--r--src/include/usr/fapi2/attribute_service.H8
-rw-r--r--src/usr/fapi2/attribute_service.C3
2 files changed, 5 insertions, 6 deletions
diff --git a/src/include/usr/fapi2/attribute_service.H b/src/include/usr/fapi2/attribute_service.H
index 5716d38a8..7e7cecfcb 100644
--- a/src/include/usr/fapi2/attribute_service.H
+++ b/src/include/usr/fapi2/attribute_service.H
@@ -242,7 +242,7 @@ fapiToTargeting::ID, sizeof(VAL), &(VAL))
//------------------------------------------------------------------------------
#define ATTR_NAME_GETMACRO(ID, PTARGET, VAL) \
AttrOverrideSync::getAttrOverrideFunc(ID, PTARGET, &VAL)\
- ? fapi2::FAPI2_RC_SUCCESS : \
+ ? fapi2::ReturnCode() : \
fapi2::platAttrSvc::platGetTargetName(PTARGET, VAL)
//------------------------------------------------------------------------------
@@ -250,7 +250,7 @@ fapiToTargeting::ID, sizeof(VAL), &(VAL))
//------------------------------------------------------------------------------
#define ATTR_FUNCTIONAL_GETMACRO(ID, PTARGET, VAL) \
AttrOverrideSync::getAttrOverrideFunc(ID, PTARGET, &VAL)\
- ? fapi2::FAPI2_RC_SUCCESS : \
+ ? fapi2::ReturnCode() : \
fapi2::platAttrSvc::platGetFunctional(PTARGET, VAL)
//------------------------------------------------------------------------------
@@ -258,7 +258,7 @@ fapiToTargeting::ID, sizeof(VAL), &(VAL))
//------------------------------------------------------------------------------
#define ATTR_POS_GETMACRO(ID, PTARGET, VAL) \
AttrOverrideSync::getAttrOverrideFunc(ID, PTARGET, &VAL)\
- ? fapi2::FAPI2_RC_SUCCESS : \
+ ? fapi2::ReturnCode() : \
fapi2::platAttrSvc::platGetTargetPos(PTARGET, VAL)
//------------------------------------------------------------------------------
@@ -266,7 +266,7 @@ fapiToTargeting::ID, sizeof(VAL), &(VAL))
//------------------------------------------------------------------------------
#define ATTR_FUSED_CORE_MODE_GETMACRO(ID, PTARGET, VAL) \
AttrOverrideSync::getAttrOverrideFunc(ID, PTARGET, &VAL)\
- ? fapi2::FAPI2_RC_SUCCESS : \
+ ? fapi2::ReturnCode() : \
fapi2::platAttrSvc::platGetFusedCoreMode(VAL)
#endif // ATTRIBUTESERVICE_H_
diff --git a/src/usr/fapi2/attribute_service.C b/src/usr/fapi2/attribute_service.C
index 46acc0ef1..a59a881c9 100644
--- a/src/usr/fapi2/attribute_service.C
+++ b/src/usr/fapi2/attribute_service.C
@@ -387,9 +387,8 @@ ReturnCode platGetTargetPos(const Target<TARGET_TYPE_ALL>& i_pFapiTarget,
//******************************************************************************
ReturnCode platGetFusedCoreMode(uint8_t & o_isFused)
{
- ReturnCode l_rc;
o_isFused = TARGETING::is_fused_mode();
- return l_rc;
+ return fapi2::ReturnCode();
}
} // End platAttrSvc namespace
OpenPOWER on IntegriCloud