diff options
author | Andres Salomon <dilinger@debian.org> | 2008-02-09 17:24:08 -0500 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2008-02-09 17:24:08 -0500 |
commit | e78a77c38cf0ce3b8169ff6a6fd3711e81dc22c8 (patch) | |
tree | 1a4a12c6ded6c3a79b46e9e59afa5ac2db7b54cb /arch | |
parent | 531021f2ca681faf58f926771f85bb5c76f13eba (diff) |
x86: GEODE: MFGPT: Minor cleanups
- uninline timer functions; the compiler knows better than we do
whether or not to inline these.
- mfgpt_start_timer() had an unused 'clock' argument, drop it.
From both Jordan and myself.
Signed-off-by: Jordan Crouse <jordan.crouse@amd.com>
Signed-off-by: Andres Salomon <dilinger@debian.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/kernel/mfgpt_32.c | 8 |
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 | ||
247 | static inline void mfgpt_disable_timer(u16 clock) | 247 | static 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 | ||
266 | static inline void mfgpt_start_timer(u16 clock, u16 delta) | 266 | static 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 | ||
286 | static int mfgpt_next_event(unsigned long delta, struct clock_event_device *evt) | 286 | static 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 | ||