summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/soc/intel/apollolake/bootblock/bootblock.c2
-rw-r--r--src/soc/intel/apollolake/include/soc/iosf.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/soc/intel/apollolake/bootblock/bootblock.c b/src/soc/intel/apollolake/bootblock/bootblock.c
index f519463071..cdf3acf602 100644
--- a/src/soc/intel/apollolake/bootblock/bootblock.c
+++ b/src/soc/intel/apollolake/bootblock/bootblock.c
@@ -49,7 +49,7 @@ static void enable_cmos_upper_bank(void)
iosf_write(IOSF_RTC_PORT_ID, RTC_CONFIG, reg);
}
-void asmlinkage bootblock_c_entry(uint64_t base_timestamp)
+asmlinkage void bootblock_c_entry(uint64_t base_timestamp)
{
device_t dev = NB_DEV_ROOT;
diff --git a/src/soc/intel/apollolake/include/soc/iosf.h b/src/soc/intel/apollolake/include/soc/iosf.h
index 99ed9fc8dc..3c96c581ac 100644
--- a/src/soc/intel/apollolake/include/soc/iosf.h
+++ b/src/soc/intel/apollolake/include/soc/iosf.h
@@ -30,12 +30,12 @@ static inline void *iosf_address(uint16_t port, uint16_t reg)
return (void *)addr;
}
-inline static void iosf_write(uint16_t port, uint16_t reg, uint32_t val)
+static inline void iosf_write(uint16_t port, uint16_t reg, uint32_t val)
{
write32(iosf_address(port, reg), val);
}
-inline static uint32_t iosf_read(uint16_t port, uint16_t reg)
+static inline uint32_t iosf_read(uint16_t port, uint16_t reg)
{
return read32(iosf_address(port, reg));
}