x86: Replace the EVT_TO_HPET_DEV() macro with an inline function
authorFerenc Wagner <wferi@niif.hu>
Fri, 18 Nov 2011 14:28:22 +0000 (15:28 +0100)
committerIngo Molnar <mingo@elte.hu>
Mon, 5 Dec 2011 12:53:36 +0000 (13:53 +0100)
The original macro worked only when applied to variables named
'evt'. While this could have been fixed by simply renaming the
macro argument, a more type-safe replacement is preferred.

Signed-off-by: Ferenc Wagner <wferi@niif.hu>
Cc: Venkatesh Pallipadi \(Venki\) <venki@google.com>
Link: http://lkml.kernel.org/r/8ed5c66c02041226e8cf8b4d5d6b41e543d90bd6.1321626272.git.wferi@niif.hu
Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/hpet.c

index b946a9eac7d9f29fb6d955e3541bf03295612367..52aae9a5fac95742add91bac0a5c3b73e2d09342 100644 (file)
@@ -32,8 +32,6 @@
 #define HPET_MIN_CYCLES                        128
 #define HPET_MIN_PROG_DELTA            (HPET_MIN_CYCLES + (HPET_MIN_CYCLES >> 1))
 
-#define EVT_TO_HPET_DEV(evt) container_of(evt, struct hpet_dev, evt)
-
 /*
  * HPET address is set in acpi/boot.c, when an ACPI entry exists
  */
@@ -55,6 +53,11 @@ struct hpet_dev {
        char                            name[10];
 };
 
+inline struct hpet_dev *EVT_TO_HPET_DEV(struct clock_event_device *evtdev)
+{
+       return container_of(evtdev, struct hpet_dev, evt);
+}
+
 inline unsigned int hpet_readl(unsigned int a)
 {
        return readl(hpet_virt_address + a);