PRD: simplified error path for getSystemTarget()

Change-Id: I06fcb51d695549ce59bc8c07532f3a83b58cbfc1
RTC: 165385
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/38122
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Brian J. Stegmiller <bjs@us.ibm.com>
Reviewed-by: Benjamin J. Weisenbeck <bweisenb@us.ibm.com>
Reviewed-by: Caleb N. Palmer <cnpalmer@us.ibm.com>
Reviewed-by: Zane C. Shelley <zshelle@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/38263
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>

1 files changed, 4 insertions, 22 deletions

diff --git a/src/usr/diag/prdf/common/plat/prdfTargetServices.C b/src/usr/diag/prdf/common/plat/prdfTargetServices.C
index 211c75fdb..e4c481057 100755
--- a/src/usr/diag/prdf/common/plat/prdfTargetServices.C
+++ b/src/usr/diag/prdf/common/plat/prdfTargetServices.C
@@ -70,15 +70,7 @@ namespace PlatServices
 // local utility function.
 ATTR_PAYLOAD_KIND_type getPayloadType()
 {
-    ATTR_PAYLOAD_KIND_type payload = PAYLOAD_KIND_UNKNOWN;
-
-    TargetHandle_t sysTrgt = getSystemTarget();
-    if ( NULL != sysTrgt )
-    {
-        payload = sysTrgt->getAttr<ATTR_PAYLOAD_KIND>();
-    }
-
-    return payload;
+    return getSystemTarget()->getAttr<ATTR_PAYLOAD_KIND>();
 }
 
 //------------------------------------------------------------------------------
@@ -115,10 +107,7 @@ bool isHyprRunning()
     #else
 
     TargetHandle_t sysTrgt = getSystemTarget();
-    if ( NULL != sysTrgt )
-    {
-        rc = (PAYLOAD_STATE_RUNNING == sysTrgt->getAttr<ATTR_PAYLOAD_STATE>());
-    }
+    rc = (PAYLOAD_STATE_RUNNING == sysTrgt->getAttr<ATTR_PAYLOAD_STATE>());
 
     #endif
 
@@ -127,16 +116,9 @@ bool isHyprRunning()
 
 bool hasRedundantClocks()
 {
-    bool l_hasRedundantClks = false;
-    TargetHandle_t l_pTarget = getSystemTarget();
-
-    if(l_pTarget && l_pTarget->getAttr<ATTR_REDUNDANT_CLOCKS>())
-    {
-        l_hasRedundantClks = true;
-    }
-
-    return l_hasRedundantClks;
+    return ( 0 != getSystemTarget()->getAttr<ATTR_REDUNDANT_CLOCKS>() );
 }
+
 //##############################################################################
 //##
 //##                 Target Manipulation Utility Functions