* [RESEND] [PATCH] Replace the dangerous EVT_TO_HPET_DEV macro with an inline function [not found] <083ba7e7209fbaeec09b5e0e94c575f969042da5.1294326889.git.wferi@niif.hu> @ 2011-11-18 14:28 ` Ferenc Wagner 2011-12-05 17:36 ` [tip:x86/cleanups] x86: Replace the EVT_TO_HPET_DEV() " tip-bot for Ferenc Wagner 0 siblings, 1 reply; 2+ messages in thread From: Ferenc Wagner @ 2011-11-18 14:28 UTC (permalink / raw) To: Venkatesh Pallipadi (Venki) Cc: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, x86, linux-kernel 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> --- arch/x86/kernel/hpet.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c index b946a9e..52aae9a 100644 --- a/arch/x86/kernel/hpet.c +++ b/arch/x86/kernel/hpet.c @@ -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); -- 1.6.5 ^ permalink raw reply related [flat|nested] 2+ messages in thread
* [tip:x86/cleanups] x86: Replace the EVT_TO_HPET_DEV() macro with an inline function 2011-11-18 14:28 ` [RESEND] [PATCH] Replace the dangerous EVT_TO_HPET_DEV macro with an inline function Ferenc Wagner @ 2011-12-05 17:36 ` tip-bot for Ferenc Wagner 0 siblings, 0 replies; 2+ messages in thread From: tip-bot for Ferenc Wagner @ 2011-12-05 17:36 UTC (permalink / raw) To: linux-tip-commits; +Cc: linux-kernel, hpa, mingo, tglx, wferi, mingo, venki Commit-ID: 3f7787b36cf2d99f3dbc8a0be85b92a5530a9a76 Gitweb: http://git.kernel.org/tip/3f7787b36cf2d99f3dbc8a0be85b92a5530a9a76 Author: Ferenc Wagner <wferi@niif.hu> AuthorDate: Fri, 18 Nov 2011 15:28:22 +0100 Committer: Ingo Molnar <mingo@elte.hu> CommitDate: Mon, 5 Dec 2011 13:53:36 +0100 x86: Replace the EVT_TO_HPET_DEV() macro with an inline function 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 | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c index b946a9e..52aae9a 100644 --- a/arch/x86/kernel/hpet.c +++ b/arch/x86/kernel/hpet.c @@ -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); ^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-12-05 17:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <083ba7e7209fbaeec09b5e0e94c575f969042da5.1294326889.git.wferi@niif.hu>
2011-11-18 14:28 ` [RESEND] [PATCH] Replace the dangerous EVT_TO_HPET_DEV macro with an inline function Ferenc Wagner
2011-12-05 17:36 ` [tip:x86/cleanups] x86: Replace the EVT_TO_HPET_DEV() " tip-bot for Ferenc Wagner
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.