aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/mfgpt_32.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/kernel/mfgpt_32.c')
-rw-r--r--arch/x86/kernel/mfgpt_32.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/kernel/mfgpt_32.c b/arch/x86/kernel/mfgpt_32.c
index 219f86eb6123..9146b2de1698 100644
--- a/arch/x86/kernel/mfgpt_32.c
+++ b/arch/x86/kernel/mfgpt_32.c
@@ -244,7 +244,7 @@ static int __init mfgpt_setup(char *str)
244} 244}
245__setup("mfgpt_irq=", mfgpt_setup); 245__setup("mfgpt_irq=", mfgpt_setup);
246 246
247static inline void mfgpt_disable_timer(u16 clock) 247static void mfgpt_disable_timer(u16 clock)
248{ 248{
249 u16 val = geode_mfgpt_read(clock, MFGPT_REG_SETUP); 249 u16 val = geode_mfgpt_read(clock, MFGPT_REG_SETUP);
250 geode_mfgpt_write(clock, MFGPT_REG_SETUP, val & ~MFGPT_SETUP_CNTEN); 250 geode_mfgpt_write(clock, MFGPT_REG_SETUP, val & ~MFGPT_SETUP_CNTEN);
@@ -263,7 +263,7 @@ static struct clock_event_device mfgpt_clockevent = {
263 .shift = 32 263 .shift = 32
264}; 264};
265 265
266static inline void mfgpt_start_timer(u16 clock, u16 delta) 266static void mfgpt_start_timer(u16 delta)
267{ 267{
268 geode_mfgpt_write(mfgpt_event_clock, MFGPT_REG_CMP2, (u16) delta); 268 geode_mfgpt_write(mfgpt_event_clock, MFGPT_REG_CMP2, (u16) delta);
269 geode_mfgpt_write(mfgpt_event_clock, MFGPT_REG_COUNTER, 0); 269 geode_mfgpt_write(mfgpt_event_clock, MFGPT_REG_COUNTER, 0);
@@ -278,14 +278,14 @@ static void mfgpt_set_mode(enum clock_event_mode mode,
278 mfgpt_disable_timer(mfgpt_event_clock); 278 mfgpt_disable_timer(mfgpt_event_clock);
279 279
280 if (mode == CLOCK_EVT_MODE_PERIODIC) 280 if (mode == CLOCK_EVT_MODE_PERIODIC)
281 mfgpt_start_timer(mfgpt_event_clock, MFGPT_PERIODIC); 281 mfgpt_start_timer(MFGPT_PERIODIC);
282 282
283 mfgpt_tick_mode = mode; 283 mfgpt_tick_mode = mode;
284} 284}
285 285
286static int mfgpt_next_event(unsigned long delta, struct clock_event_device *evt) 286static int mfgpt_next_event(unsigned long delta, struct clock_event_device *evt)
287{ 287{
288 mfgpt_start_timer(mfgpt_event_clock, delta); 288 mfgpt_start_timer(delta);
289 return 0; 289 return 0;
290} 290}
291 291