From 09e04f74c3c569427289fefd67157f2ae256d2cc Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Sat, 16 May 2009 22:36:00 +0000 Subject: Eliminate all 'inline's from the flashrom code They serve pretty much no purpose, compilers can optimize pretty much all of what we might mark as inline anyway, _and_ inlines are not enforced in any way by the compiler either. They're totally unneeded. Kill them. Corresponding to flashrom svn r522. Signed-off-by: Uwe Hermann Acked-by: Carl-Daniel Hailfinger --- ichspi.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'ichspi.c') diff --git a/ichspi.c b/ichspi.c index f53b31f..4ddf2ad 100644 --- a/ichspi.c +++ b/ichspi.c @@ -127,14 +127,14 @@ typedef struct _OPCODES { static OPCODES *curopcodes = NULL; /* HW access functions */ -static inline uint32_t REGREAD32(int X) +static uint32_t REGREAD32(int X) { volatile uint32_t regval; regval = *(volatile uint32_t *)((uint8_t *) spibar + X); return regval; } -static inline uint16_t REGREAD16(int X) +static uint16_t REGREAD16(int X) { volatile uint16_t regval; regval = *(volatile uint16_t *)((uint8_t *) spibar + X); @@ -146,8 +146,8 @@ static inline uint16_t REGREAD16(int X) #define REGWRITE8(X,Y) (*(uint8_t *)((uint8_t *)spibar+X)=Y) /* Common SPI functions */ -static inline int find_opcode(OPCODES *op, uint8_t opcode); -static inline int find_preop(OPCODES *op, uint8_t preop); +static int find_opcode(OPCODES *op, uint8_t opcode); +static int find_preop(OPCODES *op, uint8_t preop); static int generate_opcodes(OPCODES * op); static int program_opcodes(OPCODES * op); static int run_opcode(OPCODE op, uint32_t offset, @@ -192,7 +192,7 @@ OPCODES O_ST_M25P = { OPCODES O_EXISTING = {}; -static inline int find_opcode(OPCODES *op, uint8_t opcode) +static int find_opcode(OPCODES *op, uint8_t opcode) { int a; @@ -204,7 +204,7 @@ static inline int find_opcode(OPCODES *op, uint8_t opcode) return -1; } -static inline int find_preop(OPCODES *op, uint8_t preop) +static int find_preop(OPCODES *op, uint8_t preop) { int a; -- cgit v1.1