CRISv10 fasttimer: Scrap INLINE and name timeval_cmp better

Scrap the local __INLINE__ macro, and rename timeval_cmp to fasttime_cmp.

Inline macro was completely unnecessary since the macro was defined
locally to be inline.
timeval_cmp was inaccurately named since it does comparison on
struct fasttimer_t and not on struct timeval.

Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
Cc: Mikael Starvik <mikael.starvik@axis.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by Jesper Nilsson and committed by Linus Torvalds 2f1f53bd 2e2cd8ba

+7 -9
+7 -9
arch/cris/arch-v10/kernel/fasttimer.c
··· 46 #define D2(x) 47 #define DP(x) 48 49 - #define __INLINE__ inline 50 - 51 static unsigned int fast_timer_running; 52 static unsigned int fast_timers_added; 53 static unsigned int fast_timers_started; ··· 116 int timer_delay_settings[NUM_TIMER_STATS]; 117 118 /* Not true gettimeofday, only checks the jiffies (uptime) + useconds */ 119 - void __INLINE__ do_gettimeofday_fast(struct fasttime_t *tv) 120 { 121 tv->tv_jiff = jiffies; 122 tv->tv_usec = GET_JIFFIES_USEC(); 123 } 124 125 - int __INLINE__ timeval_cmp(struct fasttime_t *t0, struct fasttime_t *t1) 126 { 127 /* Compare jiffies. Takes care of wrapping */ 128 if (time_before(t0->tv_jiff, t1->tv_jiff)) ··· 138 return 0; 139 } 140 141 - void __INLINE__ start_timer1(unsigned long delay_us) 142 { 143 int freq_index = 0; /* This is the lowest resolution */ 144 unsigned long upper_limit = MAX_DELAY_US; ··· 262 fast_timers_added++; 263 264 /* Check if this should timeout before anything else */ 265 - if (tmp == NULL || timeval_cmp(&t->tv_expires, &tmp->tv_expires) < 0) 266 { 267 /* Put first in list and modify the timer value */ 268 t->prev = NULL; ··· 278 start_timer1(delay_us); 279 } else { 280 /* Put in correct place in list */ 281 - while (tmp->next && 282 - timeval_cmp(&t->tv_expires, &tmp->next->tv_expires) > 0) 283 { 284 tmp = tmp->next; 285 } ··· 380 D1(printk(KERN_DEBUG "t: %is %06ius\n", 381 tv.tv_jiff, tv.tv_usec)); 382 383 - if (timeval_cmp(&t->tv_expires, &tv) <= 0) 384 { 385 /* Yes it has expired */ 386 #ifdef FAST_TIMER_LOG
··· 46 #define D2(x) 47 #define DP(x) 48 49 static unsigned int fast_timer_running; 50 static unsigned int fast_timers_added; 51 static unsigned int fast_timers_started; ··· 118 int timer_delay_settings[NUM_TIMER_STATS]; 119 120 /* Not true gettimeofday, only checks the jiffies (uptime) + useconds */ 121 + inline void do_gettimeofday_fast(struct fasttime_t *tv) 122 { 123 tv->tv_jiff = jiffies; 124 tv->tv_usec = GET_JIFFIES_USEC(); 125 } 126 127 + inline int fasttime_cmp(struct fasttime_t *t0, struct fasttime_t *t1) 128 { 129 /* Compare jiffies. Takes care of wrapping */ 130 if (time_before(t0->tv_jiff, t1->tv_jiff)) ··· 140 return 0; 141 } 142 143 + inline void start_timer1(unsigned long delay_us) 144 { 145 int freq_index = 0; /* This is the lowest resolution */ 146 unsigned long upper_limit = MAX_DELAY_US; ··· 264 fast_timers_added++; 265 266 /* Check if this should timeout before anything else */ 267 + if (tmp == NULL || fasttime_cmp(&t->tv_expires, &tmp->tv_expires) < 0) 268 { 269 /* Put first in list and modify the timer value */ 270 t->prev = NULL; ··· 280 start_timer1(delay_us); 281 } else { 282 /* Put in correct place in list */ 283 + while (tmp->next && fasttime_cmp(&t->tv_expires, 284 + &tmp->next->tv_expires) > 0) 285 { 286 tmp = tmp->next; 287 } ··· 382 D1(printk(KERN_DEBUG "t: %is %06ius\n", 383 tv.tv_jiff, tv.tv_usec)); 384 385 + if (fasttime_cmp(&t->tv_expires, &tv) <= 0) 386 { 387 /* Yes it has expired */ 388 #ifdef FAST_TIMER_LOG