summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLee Leahy <leroy.p.leahy@intel.com>2017-03-07 15:11:07 -0800
committerMartin Roth <martinroth@google.com>2017-03-12 15:46:23 +0100
commit6625ecc3448b59b6adde3f10674cd578f06f786f (patch)
tree489719e94b16ce5fd9659d2d3fad5b85864f84df
parent84d20d0eb3869d7babaeed7cfbe53f9edad48850 (diff)
src/include: Open brace on same line as enum or struct
Fix the following errors and warning detected by checkpatch.pl: ERROR: open brace '{' following enum go on the same line ERROR: open brace '{' following struct go on the same line ERROR: that open brace { should be on the previous line WARNING: missing space after struct definition TEST=Build and run on Galileo Gen2 Change-Id: I856235d0cc3a3e59376df52561b17b872b3416b2 Signed-off-by: Lee Leahy <Leroy.P.Leahy@intel.com> Reviewed-on: https://review.coreboot.org/18653 Tested-by: build bot (Jenkins) Reviewed-by: Arthur Heymans <arthur@aheymans.xyz> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
-rw-r--r--src/include/cpu/x86/msr.h6
-rw-r--r--src/include/device/i2c.h15
-rw-r--r--src/include/device/path.h33
-rw-r--r--src/include/rtc.h3
-rw-r--r--src/include/smbios.h3
-rw-r--r--src/include/tpm_lite/tss_constants.h5
6 files changed, 26 insertions, 39 deletions
diff --git a/src/include/cpu/x86/msr.h b/src/include/cpu/x86/msr.h
index c663d29c36..1175f3b1ba 100644
--- a/src/include/cpu/x86/msr.h
+++ b/src/include/cpu/x86/msr.h
@@ -17,14 +17,12 @@ static void wrmsr(unsigned long index, msr_t msr)
#else
-typedef struct msr_struct
-{
+typedef struct msr_struct {
unsigned int lo;
unsigned int hi;
} msr_t;
-typedef struct msrinit_struct
-{
+typedef struct msrinit_struct {
unsigned int index;
msr_t msr;
} msrinit_t;
diff --git a/src/include/device/i2c.h b/src/include/device/i2c.h
index b3a5ccadd5..6115bd15e8 100644
--- a/src/include/device/i2c.h
+++ b/src/include/device/i2c.h
@@ -32,8 +32,7 @@ enum i2c_address_mode {
I2C_MODE_10_BIT
};
-struct i2c_seg
-{
+struct i2c_seg {
int read;
uint8_t chip;
uint8_t *buf;
@@ -89,8 +88,10 @@ static inline int i2c_transfer(unsigned int bus, struct i2c_seg *segments,
static inline int i2c_read_raw(unsigned int bus, uint8_t chip, uint8_t *data,
int len)
{
- struct i2c_seg seg =
- { .read = 1, .chip = chip, .buf = data, .len = len };
+ struct i2c_seg seg = {
+ .read = 1, .chip = chip, .buf = data, .len = len
+ };
+
return i2c_transfer(bus, &seg, 1);
}
@@ -102,8 +103,10 @@ static inline int i2c_read_raw(unsigned int bus, uint8_t chip, uint8_t *data,
static inline int i2c_write_raw(unsigned int bus, uint8_t chip, uint8_t *data,
int len)
{
- struct i2c_seg seg =
- { .read = 0, .chip = chip, .buf = data, .len = len };
+ struct i2c_seg seg = {
+ .read = 0, .chip = chip, .buf = data, .len = len
+ };
+
return i2c_transfer(bus, &seg, 1);
}
diff --git a/src/include/device/path.h b/src/include/device/path.h
index 1eaa32fb57..5109fdaec3 100644
--- a/src/include/device/path.h
+++ b/src/include/device/path.h
@@ -38,35 +38,29 @@ enum device_path_type {
"DEVICE_PATH_SPI", \
}
-struct domain_path
-{
+struct domain_path {
unsigned int domain;
};
-struct pci_path
-{
+struct pci_path {
unsigned int devfn;
};
-struct pnp_path
-{
+struct pnp_path {
unsigned int port;
unsigned int device;
};
-struct i2c_path
-{
+struct i2c_path {
unsigned int device;
unsigned int mode_10bit;
};
-struct spi_path
-{
+struct spi_path {
unsigned int cs;
};
-struct apic_path
-{
+struct apic_path {
unsigned int apic_id;
unsigned int package_id;
unsigned int node_id;
@@ -74,28 +68,23 @@ struct apic_path
unsigned int thread_id;
};
-struct ioapic_path
-{
+struct ioapic_path {
unsigned int ioapic_id;
};
-struct cpu_cluster_path
-{
+struct cpu_cluster_path {
unsigned int cluster;
};
-struct cpu_path
-{
+struct cpu_path {
unsigned int id;
};
-struct cpu_bus_path
-{
+struct cpu_bus_path {
unsigned int id;
};
-struct generic_path
-{
+struct generic_path {
unsigned int id;
unsigned int subid;
};
diff --git a/src/include/rtc.h b/src/include/rtc.h
index e654785769..f006e7a5cd 100644
--- a/src/include/rtc.h
+++ b/src/include/rtc.h
@@ -16,8 +16,7 @@
#ifndef _RTC_H_
#define _RTC_H_
-struct rtc_time
-{
+struct rtc_time {
int sec;
int min;
int hour;
diff --git a/src/include/smbios.h b/src/include/smbios.h
index 785ceec77d..96d9bea442 100644
--- a/src/include/smbios.h
+++ b/src/include/smbios.h
@@ -276,8 +276,7 @@ struct smbios_type2 {
char eos[2];
} __attribute__((packed));
-enum
-{
+enum {
SMBIOS_ENCLOSURE_DESKTOP = 3,
SMBIOS_ENCLOSURE_NOTEBOOK = 9,
};
diff --git a/src/include/tpm_lite/tss_constants.h b/src/include/tpm_lite/tss_constants.h
index eda7d6b31b..937e553969 100644
--- a/src/include/tpm_lite/tss_constants.h
+++ b/src/include/tpm_lite/tss_constants.h
@@ -64,8 +64,7 @@
typedef uint8_t TSS_BOOL;
typedef uint16_t TPM_STRUCTURE_TAG;
-typedef struct tdTPM_PERMANENT_FLAGS
-{
+typedef struct tdTPM_PERMANENT_FLAGS {
TPM_STRUCTURE_TAG tag;
TSS_BOOL disable;
TSS_BOOL ownership;
@@ -89,7 +88,7 @@ typedef struct tdTPM_PERMANENT_FLAGS
TSS_BOOL disableFullDALogicInfo;
} TPM_PERMANENT_FLAGS;
-typedef struct tdTPM_STCLEAR_FLAGS{
+typedef struct tdTPM_STCLEAR_FLAGS {
TPM_STRUCTURE_TAG tag;
TSS_BOOL deactivated;
TSS_BOOL disableForceClear;