summaryrefslogtreecommitdiffstats
path: root/src/usr/diag/prdf/plat/mem/prdfMemScrubUtils.C
diff options
context:
space:
mode:
authorZane Shelley <zshelle@us.ibm.com>2017-02-07 12:56:34 -0600
committerZane C. Shelley <zshelle@us.ibm.com>2017-02-10 17:34:11 -0500
commitaaacd79d799b9b99ab66505c23fc65b898550874 (patch)
treecd741390a0810fe972f61761ca8c569241755ab5 /src/usr/diag/prdf/plat/mem/prdfMemScrubUtils.C
parent8ece86143be0b2d8dcc6a8ad46faa88a7e76577a (diff)
downloadtalos-hostboot-aaacd79d799b9b99ab66505c23fc65b898550874.tar.gz
talos-hostboot-aaacd79d799b9b99ab66505c23fc65b898550874.zip
PRD: cleaned error handling for getConnectedParent() functions
The functions will now assert if no parent is found. No need to check for nullptr anymore. Change-Id: I40da83f801ab2b47f2e98b7438211d68bea0dcc7 RTC: 168856 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/36052 Reviewed-by: Benjamin J. Weisenbeck <bweisenb@us.ibm.com> Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Reviewed-by: Brian J. Stegmiller <bjs@us.ibm.com> Reviewed-by: Zane C. Shelley <zshelle@us.ibm.com> Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/36079 Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Diffstat (limited to 'src/usr/diag/prdf/plat/mem/prdfMemScrubUtils.C')
-rw-r--r--src/usr/diag/prdf/plat/mem/prdfMemScrubUtils.C4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/usr/diag/prdf/plat/mem/prdfMemScrubUtils.C b/src/usr/diag/prdf/plat/mem/prdfMemScrubUtils.C
index b1843bc36..ef429cfa8 100644
--- a/src/usr/diag/prdf/plat/mem/prdfMemScrubUtils.C
+++ b/src/usr/diag/prdf/plat/mem/prdfMemScrubUtils.C
@@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* Contributors Listed Below - COPYRIGHT 2016 */
+/* Contributors Listed Below - COPYRIGHT 2016,2017 */
/* [+] International Business Machines Corp. */
/* */
/* */
@@ -265,7 +265,6 @@ uint32_t checkEccFirs<TYPE_MCA>( ExtensibleChip * i_chip,
PRDF_ASSERT( TYPE_MCA == i_chip->getType() );
ExtensibleChip * mcbChip = getConnectedParent( i_chip, TYPE_MCBIST );
- PRDF_ASSERT( nullptr != mcbChip );
SCAN_COMM_REGISTER_CLASS * mcaeccfir = i_chip->getRegister( "MCAECCFIR" );
SCAN_COMM_REGISTER_CLASS * mcbistfir = mcbChip->getRegister( "MCBISTFIR" );
@@ -328,7 +327,6 @@ uint32_t checkEccFirs<TYPE_MBA>( ExtensibleChip * i_chip,
PRDF_ASSERT( TYPE_MBA == i_chip->getType() );
ExtensibleChip * membChip = getConnectedParent( i_chip, TYPE_MEMBUF );
- PRDF_ASSERT( nullptr != membChip );
const char * reg = (0 == i_chip->getPos()) ? "MBA0_MBSECCFIR"
: "MBA1_MBSECCFIR";
OpenPOWER on IntegriCloud