PRD: Cleanup RC handling in PLL code

Change-Id: If749f5ce6a4934ce6c52faced348c8165d320bef
CQ: SW431060
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/60394
Reviewed-by: Zane C. Shelley <zshelle@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/60522
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>

2 files changed, 20 insertions, 20 deletions

diff --git a/src/usr/diag/prdf/common/plat/p9/prdfP9Pll.C b/src/usr/diag/prdf/common/plat/p9/prdfP9Pll.C
index 9f90c2927..c242caeb4 100644
--- a/src/usr/diag/prdf/common/plat/p9/prdfP9Pll.C
+++ b/src/usr/diag/prdf/common/plat/p9/prdfP9Pll.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2016,2017                        */
+/* Contributors Listed Below - COPYRIGHT 2016,2018                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -337,7 +337,6 @@ int32_t clearParityError( ExtensibleChip * i_chip,
                           STEP_CODE_DATA_STRUCT & i_sc )
 {
     #define PRDF_FUNC "[Proc::clearParityError] "
-    int32_t rc = SUCCESS;
 
     if ( CHECK_STOP != i_sc.service_data->getPrimaryAttnType() )
     {
@@ -351,7 +350,7 @@ int32_t clearParityError( ExtensibleChip * i_chip,
         ClearChipletParityError(i_chip, TYPE_CORE);
     }
 
-    return rc;
+    return SUCCESS;
     #undef PRDF_FUNC
 }
 PRDF_PLUGIN_DEFINE_NS( p9_nimbus,  Proc, clearParityError );
@@ -386,7 +385,7 @@ int32_t QueryPll( ExtensibleChip * i_chip,
                  i_chip->getHuid());
     }
 
-    return rc;
+    return SUCCESS;
 
     #undef PRDF_FUNC
 }
@@ -431,7 +430,7 @@ int32_t ClearPll( ExtensibleChip * i_chip,
         }
     }
 
-    return rc;
+    return SUCCESS;
 
     #undef PRDF_FUNC
 }
@@ -492,7 +491,7 @@ int32_t MaskPll( ExtensibleChip * i_chip,
         }
     }
 
-    return rc;
+    return SUCCESS;
 }
 PRDF_PLUGIN_DEFINE_NS( p9_nimbus,  Proc, MaskPll );
 PRDF_PLUGIN_DEFINE_NS( p9_cumulus, Proc, MaskPll );
diff --git a/src/usr/diag/prdf/common/plat/p9/prdfP9PllDomain.C b/src/usr/diag/prdf/common/plat/p9/prdfP9PllDomain.C
index fc42d0e68..2d9c25752 100644
--- a/src/usr/diag/prdf/common/plat/p9/prdfP9PllDomain.C
+++ b/src/usr/diag/prdf/common/plat/p9/prdfP9PllDomain.C
@@ -142,24 +142,25 @@ int32_t PllDomain::Analyze(STEP_CODE_DATA_STRUCT & serviceData,
             nfchips.push_back( l_chip );
         }
 
+        // Continue if no clock errors reported on this chip
+        if ( 0 == l_errType )
+            continue;
+
         // Get this chip's capture data for any error
-        if (0 != l_errType)
-        {
-            l_chip->CaptureErrorData(
+        l_chip->CaptureErrorData(
                     serviceData.service_data->GetCaptureData());
-            // Capture PllFIRs group
-            l_chip->CaptureErrorData(
+        // Capture PllFIRs group
+        l_chip->CaptureErrorData(
                     serviceData.service_data->GetCaptureData(),
                     Util::hashString("PllFIRs"));
 
-            // Call this chip's capturePllFfdc plugin if it exists.
-            ExtensibleChipFunction * l_captureFfdc =
-                l_chip->getExtensibleFunction("capturePllFfdc", true);
-            if ( NULL != l_captureFfdc )
-            {
-                (*l_captureFfdc)( l_chip,
-                PluginDef::bindParm<STEP_CODE_DATA_STRUCT &>(serviceData) );
-            }
+        // Call this chip's capturePllFfdc plugin if it exists.
+        ExtensibleChipFunction * l_captureFfdc =
+            l_chip->getExtensibleFunction("capturePllFfdc", true);
+        if ( NULL != l_captureFfdc )
+        {
+            (*l_captureFfdc)( l_chip,
+            PluginDef::bindParm<STEP_CODE_DATA_STRUCT &>(serviceData) );
         }
 
         // In the case of a PLL_UNLOCK error, we want to do additional isolation
@@ -365,7 +366,7 @@ int32_t PllDomain::Analyze(STEP_CODE_DATA_STRUCT & serviceData,
                 PluginDef::bindParm<STEP_CODE_DATA_STRUCT&>(serviceData));
     }
 
-    return rc;
+    return SUCCESS;
 
     #undef PRDF_FUNC
 }