summaryrefslogtreecommitdiff
path: root/src/soc
diff options
context:
space:
mode:
authorLee Leahy <leroy.p.leahy@intel.com>2017-03-09 10:38:09 -0800
committerMartin Roth <martinroth@google.com>2017-03-13 17:47:37 +0100
commit2d154e8213d9b956acfd6638e8988e261980802e (patch)
tree6f338cd5a425e77d52715d11a573781e99b1b4ba /src/soc
parentd8fb362ea0d1ae332d35ef7a62e64a372fe96712 (diff)
soc/intel/apollolake: Fix position of storage class
Fix the following error and warning detected by checkpatch.pl: ERROR: inline keyword should sit between storage class and type WARNING: storage class should be at the beginning of the declaration TEST=Build for reef Change-Id: I2ed418cc3b4a989eb1101013944169429bf147c2 Signed-off-by: Lee Leahy <leroy.p.leahy@intel.com> Reviewed-on: https://review.coreboot.org/18726 Tested-by: build bot (Jenkins) Reviewed-by: Philippe Mathieu-Daudé <philippe.mathieu.daude@gmail.com> Reviewed-by: Martin Roth <martinroth@google.com>
Diffstat (limited to 'src/soc')
-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));
}