commit e686ee8bf7b40d3aed16a4d6d9a42f99ab31ad8e
author Lee Leahy <leroy.p.leahy@intel.com> Fri Mar 10 08:45:30 2017 -0800
committer Lee Leahy <leroy.p.leahy@intel.com> Fri Mar 10 20:08:02 2017 +0100
tree bcbb1f8f71e89e8fd700a3ec07d753bb7648a7af
parent b2b97a5db27befc10b015c8971c35e7ff6993d09

drivers/intel/fsp2_0: Remove braces for single statements

Fix the following warning detected by checkpatch.pl:

WARNING: braces {} are not necessary for single statement blocks

TEST=Build and run on Galileo Gen2

Change-Id: Ibd351703e60acebbacd6ae5b1a2fa1cb34fd3ff9
Signed-off-by: Lee Leahy <leroy.p.leahy@intel.com>
Reviewed-on: https://review.coreboot.org/18745
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@chromium.org>

src/drivers/intel/fsp2_0/memory_init.c

diff --git a/src/drivers/intel/fsp2_0/memory_init.c b/src/drivers/intel/fsp2_0/memory_init.c
index 46dd2ef..559d83e 100644
--- a/src/drivers/intel/fsp2_0/memory_init.c
+++ b/src/drivers/intel/fsp2_0/memory_init.c
@@ -293,9 +293,8 @@
 
 	upd = (FSPM_UPD *)(hdr->cfg_region_offset + hdr->image_base);
 
-	if (upd->FspUpdHeader.Signature != FSPM_UPD_SIGNATURE) {
+	if (upd->FspUpdHeader.Signature != FSPM_UPD_SIGNATURE)
 		die("Invalid FSPM signature!\n");
-	}
 
 	/* Copy the default values from the UPD area */
 	memcpy(&fspm_upd, upd, sizeof(fspm_upd));
@@ -417,9 +416,8 @@
 	else
 		status = load_fspm_xip(&hdr, &file_data);
 
-	if (status != CB_SUCCESS) {
+	if (status != CB_SUCCESS)
 		die("Loading FSPM failed!\n");
-	}
 
 	/* Signal that FSP component has been loaded. */
 	prog_segment_loaded(hdr.image_base, hdr.image_size, SEG_FINAL);

src/drivers/intel/fsp2_0/silicon_init.c

diff --git a/src/drivers/intel/fsp2_0/silicon_init.c b/src/drivers/intel/fsp2_0/silicon_init.c
index a57f976..9f0bf7c 100644
--- a/src/drivers/intel/fsp2_0/silicon_init.c
+++ b/src/drivers/intel/fsp2_0/silicon_init.c
@@ -32,9 +32,8 @@
 
 	supd = (FSPS_UPD *) (hdr->cfg_region_offset + hdr->image_base);
 
-	if (supd->FspUpdHeader.Signature != FSPS_UPD_SIGNATURE) {
+	if (supd->FspUpdHeader.Signature != FSPS_UPD_SIGNATURE)
 		die("Invalid FSPS signature\n");
-	}
 
 	memcpy(&upd, supd, sizeof(upd));
 
@@ -96,16 +95,14 @@
 	size = region_device_sz(&rdev);
 	dest = cbmem_add(CBMEM_ID_REFCODE, size);
 
-	if (dest == NULL) {
+	if (dest == NULL)
 		die("Could not add FSPS to CBMEM!\n");
-	}
 
 	if (rdev_readat(&rdev, dest, 0, size) < 0)
 		die("Failed to read FSPS!\n");
 
-	if (fsp_component_relocate((uintptr_t)dest, dest, size) < 0) {
+	if (fsp_component_relocate((uintptr_t)dest, dest, size) < 0)
 		die("Unable to relocate FSPS!\n");
-	}
 
 	/* Create new region device in memory after relocation. */
 	rdev_chain(&rdev, &addrspace_32bit.rdev, (uintptr_t)dest, size);