[coreboot-gerrit] Change in ...coreboot[master]: nb/amd/amdmct/mct: Simplify conditional

[Nico Huber (Code Review)]

Nico Huber has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/33211 )

Change subject: nb/amd/amdmct/mct: Simplify conditional
......................................................................

nb/amd/amdmct/mct: Simplify conditional

These if statements can be combined to merge the two branches of the
conditional and remove the duplicate pDCTstat->Speed == 3 check.

Change-Id: I41aa19b4b7ed7b1a0e4f83f72e66869760e677dd
Signed-off-by: Jacob Garber 
Found-by: Coverity CID 1229583
Reviewed-on: https://review.coreboot.org/c/coreboot/+/33211
Tested-by: build bot (Jenkins) 
Reviewed-by: Angel Pons 
---
M src/northbridge/amd/amdmct/mct/mctardk3.c
1 file changed, 4 insertions(+), 12 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Angel Pons: Looks good to me, approved

diff --git a/src/northbridge/amd/amdmct/mct/mctardk3.c b/src/northbridge/amd/amdmct/mct/mctardk3.c
index ce79a52..4eac790 100644
--- a/src/northbridge/amd/amdmct/mct/mctardk3.c
+++ b/src/northbridge/amd/amdmct/mct/mctardk3.c
@@ -90,21 +90,13 @@
    			valx &= 0xAA;
    			valx >>= 1;
    		}
-			if (mctGet_NVbits(NV_MAX_DIMMS) == 8) {
-				val &= valx;
-				if (val != 0) {
+			val &= valx;
+			if (val != 0) {
+				if (mctGet_NVbits(NV_MAX_DIMMS) == 8 ||
+						pDCTstat->Speed == 3) {
    				pDCTstat->CH_ADDR_TMG[dct] &= 0xFFFF00FF;
    				pDCTstat->CH_ADDR_TMG[dct] |= 0x00002F00;
    			}
-			} else {
-				val &= valx;
-				if (val != 0) {
-					if (pDCTstat->Speed == 3 || pDCTstat->Speed == 3) {
-						pDCTstat->CH_ADDR_TMG[dct] &= 0xFFFF00FF;
-						pDCTstat->CH_ADDR_TMG[dct] |= 0x00002F00;
-					}
-				}
-
    		}
    	}
    }