commit bfdb8937b27700546bc233287c657e2f634a3177
author Lee Leahy <leroy.p.leahy@intel.com> Tue Mar 07 15:17:04 2017 -0800
committer Martin Roth <martinroth@google.com> Sun Mar 12 15:47:06 2017 +0100
tree b15370717de3a6f0f578cff1d575f0b53383cd9b
parent 6625ecc3448b59b6adde3f10674cd578f06f786f

src/include: 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: I00b59f6a27c3acb393deaa763596363b7e958efd
Signed-off-by: Lee Leahy <Leroy.P.Leahy@intel.com>
Reviewed-on: https://review.coreboot.org/18654
Tested-by: build bot (Jenkins)
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>

src/include/cpu/amd/model_fxx_rev.h

diff --git a/src/include/cpu/amd/model_fxx_rev.h b/src/include/cpu/amd/model_fxx_rev.h
index e34b4ed..210a652 100644
--- a/src/include/cpu/amd/model_fxx_rev.h
+++ b/src/include/cpu/amd/model_fxx_rev.h
@@ -74,9 +74,8 @@
 		return 1;
 
 	// we don't need to do that for node 0 in core0/node0
-	if (nodeid == 0) {
+	if (nodeid == 0)
 		return !is_cpu_pre_e0();
-	}
 
 	// d0 will be treated as e0 with this methods, but the d0 nb_cfg_54 always 0
 	pci_devfn_t dev;
@@ -89,9 +88,8 @@
 	e0_later = !!(val & (1<<3));
 
 	// pre_e0 bit 3 always be 0 and can not be changed
-	if (e0_later) {
+	if (e0_later)
 		pci_write_config32(dev, 0x80, val_old); // restore it
-	}
 
 	return e0_later;
 }

src/include/device/pci.h

diff --git a/src/include/device/pci.h b/src/include/device/pci.h
index 13d63d4..e18a09a 100644
--- a/src/include/device/pci.h
+++ b/src/include/device/pci.h
@@ -103,9 +103,8 @@
 {
 	const struct pci_operations *pops;
 	pops = 0;
-	if (dev && dev->ops) {
+	if (dev && dev->ops)
 		pops = dev->ops->ops_pci;
-	}
 	return pops;
 }
 

src/include/pc80/mc146818rtc.h

diff --git a/src/include/pc80/mc146818rtc.h b/src/include/pc80/mc146818rtc.h
index 39f58d6..be90358 100644
--- a/src/include/pc80/mc146818rtc.h
+++ b/src/include/pc80/mc146818rtc.h
@@ -140,14 +140,12 @@
 	 * eg. the Century / AltCentury byte. So to be safe, disable
 	 * RTC before changing any value.
 	 */
-	if ((addr != RTC_CONTROL) && !(control_state & RTC_SET)) {
+	if ((addr != RTC_CONTROL) && !(control_state & RTC_SET))
 		cmos_write_inner(control_state | RTC_SET, RTC_CONTROL);
-	}
 	cmos_write_inner(val, addr);
 	/* reset to prior configuration */
-	if ((addr != RTC_CONTROL) && !(control_state & RTC_SET)) {
+	if ((addr != RTC_CONTROL) && !(control_state & RTC_SET))
 		cmos_write_inner(control_state, RTC_CONTROL);
-	}
 }
 
 static inline void cmos_disable_rtc(void)

src/include/string.h

diff --git a/src/include/string.h b/src/include/string.h
index f2777a9..d547e49 100644
--- a/src/include/string.h
+++ b/src/include/string.h
@@ -24,18 +24,16 @@
 static inline size_t strnlen(const char *src, size_t max)
 {
 	size_t i = 0;
-	while ((*src++) && (i < max)) {
+	while ((*src++) && (i < max))
 		i++;
-	}
 	return i;
 }
 
 static inline size_t strlen(const char *src)
 {
 	size_t i = 0;
-	while (*src++) {
+	while (*src++)
 		i++;
-	}
 	return i;
 }