commit e104934a23d73f1698cfc33093689d28bce0f076
author Felix Singer <felixsinger@posteo.net> Tue Aug 11 06:34:15 2020 +0200
committer Michael Niewöhner <c0d3z3r0@review.coreboot.org> Thu Aug 13 17:40:04 2020 +0000
tree 201614fe745c6f9bf8ad73dcfe2d8e9345702675
parent ffa710b9dd241cc7545858a2ac69f7cdb214cddf

soc/intel/skylake: Refactor ternary expressions

To be consistent with the rest of the tree, replace all left ternary
expressions, which are used for device enablement / disablement,
with `dev && dev->enabled`.

Change-Id: Ie7afa48bf2c8bdad5a043f7cb6953d05b7b6597d
Signed-off-by: Felix Singer <felixsinger@posteo.net>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/44365
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Michael Niewöhner

src/soc/intel/skylake/chip.c

diff --git a/src/soc/intel/skylake/chip.c b/src/soc/intel/skylake/chip.c
index 9239fd2..e96d624 100644
--- a/src/soc/intel/skylake/chip.c
+++ b/src/soc/intel/skylake/chip.c
@@ -167,7 +167,7 @@
 	}
 
 	dev = pcidev_path_on_root(PCH_DEVFN_SATA);
-	params->SataEnable = dev ? dev->enabled : 0;
+	params->SataEnable = dev && dev->enabled;
 	if (params->SataEnable) {
 		memcpy(params->SataPortsEnable, config->SataPortsEnable,
 				sizeof(params->SataPortsEnable));
@@ -236,7 +236,7 @@
 	params->SaImguEnable = dev && dev->enabled;
 
 	dev = pcidev_path_on_root(PCH_DEVFN_CSE_3);
-	params->Heci3Enabled = dev ? dev->enabled : 0;
+	params->Heci3Enabled = dev && dev->enabled;
 
 	params->LogoPtr = config->LogoPtr;
 	params->LogoSize = config->LogoSize;
@@ -248,7 +248,7 @@
 	params->PchPmLanWakeFromDeepSx = config->WakeConfigPcieWakeFromDeepSx;
 
 	dev = pcidev_path_on_root(PCH_DEVFN_GBE);
-	params->PchLanEnable = dev ? dev->enabled : 0;
+	params->PchLanEnable = dev && dev->enabled;
 	if (params->PchLanEnable) {
 		params->PchLanLtrEnable = config->EnableLanLtr;
 		params->PchLanK1OffEnable = config->EnableLanK1Off;
@@ -258,7 +258,7 @@
 	params->SsicPortEnable = config->SsicPortEnable;
 
 	dev = pcidev_path_on_root(PCH_DEVFN_EMMC);
-	params->ScsEmmcEnabled = dev ? dev->enabled : 0;
+	params->ScsEmmcEnabled = dev && dev->enabled;
 	params->ScsEmmcHs400Enabled = config->ScsEmmcHs400Enabled;
 
 	dev = pcidev_path_on_root(PCH_DEVFN_SDCARD);
@@ -275,10 +275,10 @@
 
 	/* If ISH is enabled, enable ISH elements */
 	dev = pcidev_path_on_root(PCH_DEVFN_ISH);
-	params->PchIshEnable = dev ? dev->enabled : 0;
+	params->PchIshEnable = dev && dev->enabled;
 
 	dev = pcidev_path_on_root(PCH_DEVFN_HDA);
-	params->PchHdaEnable = dev ? dev->enabled : 0;
+	params->PchHdaEnable = dev && dev->enabled;
 
 	params->PchHdaVcType = config->PchHdaVcType;
 	params->PchHdaIoBufferOwnership = config->IoBufferOwnership;
@@ -353,7 +353,7 @@
 
 	/* Show SPI controller if enabled in devicetree.cb */
 	dev = pcidev_path_on_root(PCH_DEVFN_SPI);
-	params->ShowSpiController = dev ? dev->enabled : 0;
+	params->ShowSpiController = dev && dev->enabled;
 
 	/* Enable xDCI controller if enabled in devicetree and allowed */
 	dev = pcidev_path_on_root(PCH_DEVFN_USBOTG);
@@ -367,7 +367,7 @@
 
 	/* Enable or disable Gaussian Mixture Model in devicetree */
 	dev = pcidev_path_on_root(SA_DEVFN_GMM);
-	params->GmmEnable = dev ? dev->enabled : 0;
+	params->GmmEnable = dev && dev->enabled;
 
 	/*
 	 * Send VR specific mailbox commands: