erebion/coreboot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UPSTREAM: src/include: Move trailing statements to next line

Browse source 
Fix the following error detected by checkpatch.pl:

ERROR: trailing statements should be on next line

TEST=Build and run on Galileo Gen2

Change-Id: If0becceb9b15ff43fd2e5114fa71ab2c5b496c73
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: e0f5dfc678
Original-Change-Id: I169f520db6f62dfea50d2bb8fb69a8e8257f86c7
Original-Signed-off-by: Lee Leahy <Leroy.P.Leahy@intel.com>
Original-Reviewed-on: https://review.coreboot.org/18643
Original-Tested-by: build bot (Jenkins)
Original-Reviewed-by: Martin Roth <martinroth@google.com>
Reviewed-on: https://chromium-review.googlesource.com/452474
This commit is contained in:
Lee Leahy 2017-03-07 11:44:05 -08:00 • committed by chrome-bot
commit 74c8d8d102
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/include/assert.h
View file

@ -24,13 +24,15 @@
if (!(x)) { \
printk(BIOS_EMERG, "ASSERTION ERROR: file '%s'" \
", line %d\n", __FILE__, __LINE__); \
if (IS_ENABLED(CONFIG_FATAL_ASSERTS)) hlt(); \
if (IS_ENABLED(CONFIG_FATAL_ASSERTS)) \
hlt(); \
} \
}
#define BUG() { \
printk(BIOS_EMERG, "ERROR: BUG ENCOUNTERED at file '%s'"\
", line %d\n", __FILE__, __LINE__); \
if (IS_ENABLED(CONFIG_FATAL_ASSERTS)) hlt(); \
if (IS_ENABLED(CONFIG_FATAL_ASSERTS)) \
hlt(); \
}
#define assert(statement) ASSERT(statement)

6
src/include/cpu/amd/model_fxx_rev.h
View file

@ -73,7 +73,8 @@ static inline int is_e0_later_in_bsp(int nodeid)
if (IS_ENABLED(CONFIG_K8_REV_F_SUPPORT))
return 1;
if (nodeid == 0) { // we don't need to do that for node 0 in core0/node0
// we don't need to do that for node 0 in core0/node0
if (nodeid == 0) {
return !is_cpu_pre_e0();
}
@ -87,7 +88,8 @@ static inline int is_e0_later_in_bsp(int nodeid)
val = pci_read_config32(dev, 0x80);
e0_later = !!(val & (1<<3));
if (e0_later) { // pre_e0 bit 3 always be 0 and can not be changed
// pre_e0 bit 3 always be 0 and can not be changed
if (e0_later) {
pci_write_config32(dev, 0x80, val_old); // restore it
}