[PATCH] x86: make apic_* operations inline functions

* [PATCH] x86: make apic_* operations inline functions
  2009-02-10 20:00 [PATCH] *** SUBJECT HERE *** Jeremy Fitzhardinge
  2009-02-09 20:05 ` [PATCH] x86: unstatic mp_find_ioapic so it can be used elsewhere Jeremy Fitzhardinge
  2009-02-09 20:05 ` [PATCH] x86: unstatic ioapic entry funcs Jeremy Fitzhardinge
@ 2009-02-09 20:05 ` Jeremy Fitzhardinge
  2009-02-09 20:05 ` [PATCH] x86: add mp_find_ioapic_pin Jeremy Fitzhardinge
                   ` (2 subsequent siblings)
  5 siblings, 0 replies; 8+ messages in thread
From: Jeremy Fitzhardinge @ 2009-02-09 20:05 UTC (permalink / raw)
  Cc: Ingo Molnar, x86, Linux Kernel Mailing List, Yinghai Lu

Mainly to get proper type-checking and consistency.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
---
 arch/x86/include/asm/apic.h |   35 +++++++++++++++++++++++++++++------
 1 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
index b03711d..f4835a1 100644
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -139,12 +139,35 @@ struct apic_ops {
 
 extern struct apic_ops *apic_ops;
 
-#define apic_read (apic_ops->read)
-#define apic_write (apic_ops->write)
-#define apic_icr_read (apic_ops->icr_read)
-#define apic_icr_write (apic_ops->icr_write)
-#define apic_wait_icr_idle (apic_ops->wait_icr_idle)
-#define safe_apic_wait_icr_idle (apic_ops->safe_wait_icr_idle)
+static inline u32 apic_read(u32 reg)
+{
+	return apic_ops->read(reg);
+}
+
+static inline void apic_write(u32 reg, u32 val)
+{
+	apic_ops->write(reg, val);
+}
+
+static inline u64 apic_icr_read(void)
+{
+	return apic_ops->icr_read();
+}
+
+static inline void apic_icr_write(u32 low, u32 high)
+{
+	apic_ops->icr_write(low, high);
+}
+
+static inline void apic_wait_icr_idle(void)
+{
+	apic_ops->wait_icr_idle();
+}
+
+static inline u32 safe_apic_wait_icr_idle(void)
+{
+	return apic_ops->safe_wait_icr_idle();
+}
 
 extern int get_physical_broadcast(void);
 
-- 
1.6.0.6



^ permalink raw reply related	[flat|nested] 8+ messages in thread