Skip to content

Commit

Permalink
x86: Replace the EVT_TO_HPET_DEV() macro with an inline function
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Ferenc Wagner authored and Ingo Molnar committed Dec 5, 2011
1 parent 8e8da02 commit 3f7787b
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions arch/x86/kernel/hpet.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand All @@ -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);
Expand Down

0 comments on commit 3f7787b

Please sign in to comment.