diff options
-rw-r--r-- | src/include/bootstate.h | 2 | ||||
-rw-r--r-- | src/include/cpu/x86/cr.h | 8 | ||||
-rw-r--r-- | src/include/cpu/x86/mtrr.h | 2 | ||||
-rw-r--r-- | src/include/cpu/x86/smm.h | 2 | ||||
-rw-r--r-- | src/include/device/device.h | 12 | ||||
-rw-r--r-- | src/include/reg_script.h | 2 | ||||
-rw-r--r-- | src/include/rmodule.h | 2 | ||||
-rw-r--r-- | src/include/thread.h | 2 |
8 files changed, 16 insertions, 16 deletions
diff --git a/src/include/bootstate.h b/src/include/bootstate.h index efe72322d3..4e95ca4f3c 100644 --- a/src/include/bootstate.h +++ b/src/include/bootstate.h @@ -183,7 +183,7 @@ struct boot_state_init_entry { }; #if ENV_RAMSTAGE -#define BOOT_STATE_INIT_ATTR __attribute__ ((used, section (".bs_init"))) +#define BOOT_STATE_INIT_ATTR __attribute__ ((used, section(".bs_init"))) #else #define BOOT_STATE_INIT_ATTR __attribute__ ((unused)) #endif diff --git a/src/include/cpu/x86/cr.h b/src/include/cpu/x86/cr.h index 175b1e84be..dafa791213 100644 --- a/src/include/cpu/x86/cr.h +++ b/src/include/cpu/x86/cr.h @@ -42,7 +42,7 @@ static alwaysinline CRx_TYPE read_cr0(void) CRx_TYPE value; __asm__ __volatile__ ( "mov %%cr0, %0" - : CRx_RET (value) + : CRx_RET(value) : : COMPILER_BARRIER ); @@ -54,7 +54,7 @@ static alwaysinline void write_cr0(CRx_TYPE data) __asm__ __volatile__ ( "mov %0, %%cr0" : - : CRx_IN (data) + : CRx_IN(data) : COMPILER_BARRIER ); } @@ -64,7 +64,7 @@ static alwaysinline CRx_TYPE read_cr4(void) CRx_TYPE value; __asm__ __volatile__ ( "mov %%cr4, %0" - : CRx_RET (value) + : CRx_RET(value) : : COMPILER_BARRIER ); @@ -76,7 +76,7 @@ static alwaysinline void write_cr4(CRx_TYPE data) __asm__ __volatile__ ( "mov %0, %%cr4" : - : CRx_IN (data) + : CRx_IN(data) : COMPILER_BARRIER ); } diff --git a/src/include/cpu/x86/mtrr.h b/src/include/cpu/x86/mtrr.h index ddafc1eec3..e4e1f9b8e5 100644 --- a/src/include/cpu/x86/mtrr.h +++ b/src/include/cpu/x86/mtrr.h @@ -43,7 +43,7 @@ #define MTRR_FIX_4K_F0000 0x26e #define MTRR_FIX_4K_F8000 0x26f -#if !defined (__ASSEMBLER__) && !defined(__PRE_RAM__) +#if !defined(__ASSEMBLER__) && !defined(__PRE_RAM__) #include <stdint.h> #include <stddef.h> diff --git a/src/include/cpu/x86/smm.h b/src/include/cpu/x86/smm.h index 0489ece917..f07cac35cf 100644 --- a/src/include/cpu/x86/smm.h +++ b/src/include/cpu/x86/smm.h @@ -511,7 +511,7 @@ struct smm_module_params { }; /* smm_handler_t is called with arg of smm_module_params pointer. */ -typedef void asmlinkage (*smm_handler_t)(void *); +typedef asmlinkage void (*smm_handler_t)(void *); #ifdef __SMM__ /* SMM Runtime helpers. */ diff --git a/src/include/device/device.h b/src/include/device/device.h index 74ec508e4a..d3efdd2303 100644 --- a/src/include/device/device.h +++ b/src/include/device/device.h @@ -195,11 +195,11 @@ void run_bios(struct device *dev, unsigned long addr); /* Helper functions */ device_t find_dev_path(struct bus *parent, struct device_path *path); device_t alloc_find_dev(struct bus *parent, struct device_path *path); -device_t dev_find_device (u16 vendor, u16 device, device_t from); -device_t dev_find_class (unsigned int class, device_t from); +device_t dev_find_device(u16 vendor, u16 device, device_t from); +device_t dev_find_class(unsigned int class, device_t from); device_t dev_find_path(device_t prev_match, enum device_path_type path_type); -device_t dev_find_slot (unsigned int bus, unsigned int devfn); -device_t dev_find_slot_on_smbus (unsigned int bus, unsigned int addr); +device_t dev_find_slot(unsigned int bus, unsigned int devfn); +device_t dev_find_slot_on_smbus(unsigned int bus, unsigned int addr); device_t dev_find_slot_pnp(u16 port, u16 device); device_t dev_find_lapic(unsigned int apic_id); int dev_count_cpu(void); @@ -268,11 +268,11 @@ u32 find_pci_tolm(struct bus *bus); #else /* vv __SIMPLE_DEVICE__ vv */ -ROMSTAGE_CONST struct device *dev_find_slot (unsigned int bus, +ROMSTAGE_CONST struct device *dev_find_slot(unsigned int bus, unsigned int devfn); ROMSTAGE_CONST struct device *dev_find_next_pci_device( ROMSTAGE_CONST struct device *previous_dev); -ROMSTAGE_CONST struct device *dev_find_slot_on_smbus (unsigned int bus, +ROMSTAGE_CONST struct device *dev_find_slot_on_smbus(unsigned int bus, unsigned int addr); ROMSTAGE_CONST struct device *dev_find_slot_pnp(u16 port, u16 device); diff --git a/src/include/reg_script.h b/src/include/reg_script.h index 3d8b72b2c5..13af794f1c 100644 --- a/src/include/reg_script.h +++ b/src/include/reg_script.h @@ -107,7 +107,7 @@ struct reg_script_bus_entry { void (*reg_script_write)(struct reg_script_context *ctx); }; -#define REG_SCRIPT_TABLE_ATTRIBUTE __attribute__ ((used, section (".rsbe_init"))) +#define REG_SCRIPT_TABLE_ATTRIBUTE __attribute__ ((used, section(".rsbe_init"))) #define REG_SCRIPT_BUS_ENTRY(bus_entry_) \ const struct reg_script_bus_entry *rsbe_ ## bus_entry_ \ diff --git a/src/include/rmodule.h b/src/include/rmodule.h index 2511537561..37fab4b19d 100644 --- a/src/include/rmodule.h +++ b/src/include/rmodule.h @@ -72,7 +72,7 @@ struct rmodule { #if IS_ENABLED(CONFIG_RELOCATABLE_MODULES) /* Rmodules have an entry point of named _start. */ #define RMODULE_ENTRY(entry_) \ - void _start(void *) __attribute__((alias (STRINGIFY(entry_)))) + void _start(void *) __attribute__((alias(STRINGIFY(entry_)))) #else #define RMODULE_ENTRY(entry_) #endif diff --git a/src/include/thread.h b/src/include/thread.h index 25594a8de4..d2006359d5 100644 --- a/src/include/thread.h +++ b/src/include/thread.h @@ -70,7 +70,7 @@ void asmlinkage switch_to_thread(uintptr_t new_stack, uintptr_t *saved_stack); * will enter the thread_entry() function with arg as a parameter. The * saved_stack field in the struct thread needs to be updated accordingly. */ void arch_prepare_thread(struct thread *t, - void asmlinkage (*thread_entry)(void *), void *arg); + asmlinkage void (*thread_entry)(void *), void *arg); #else static inline void threads_initialize(void) {} static inline int thread_run(void (*func)(void *), void *arg) { return -1; } |