[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-4ce78e2094fc2736f8ecd04ec85e5566acaed516@git.kernel.org>
Date: Thu, 27 Jun 2019 16:39:02 -0700
From: tip-bot for Thomas Gleixner <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: eranian@...gle.com, peterz@...radead.org, tglx@...utronix.de,
linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...nel.org,
ashok.raj@...el.com, andi.kleen@...el.com,
ricardo.neri-calderon@...ux.intel.com,
Suravee.Suthikulpanit@....com, ravi.v.shankar@...el.com
Subject: [tip:x86/timers] x86/hpet: Sanitize stub functions
Commit-ID: 4ce78e2094fc2736f8ecd04ec85e5566acaed516
Gitweb: https://git.kernel.org/tip/4ce78e2094fc2736f8ecd04ec85e5566acaed516
Author: Thomas Gleixner <tglx@...utronix.de>
AuthorDate: Sun, 23 Jun 2019 15:23:48 +0200
Committer: Thomas Gleixner <tglx@...utronix.de>
CommitDate: Fri, 28 Jun 2019 00:57:17 +0200
x86/hpet: Sanitize stub functions
Mark them inline and remove the pointless 'return;' statement.
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
Reviewed-by: Ingo Molnar <mingo@...nel.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Ricardo Neri <ricardo.neri-calderon@...ux.intel.com>
Cc: Ashok Raj <ashok.raj@...el.com>
Cc: Andi Kleen <andi.kleen@...el.com>
Cc: Suravee Suthikulpanit <Suravee.Suthikulpanit@....com>
Cc: Stephane Eranian <eranian@...gle.com>
Cc: Ravi Shankar <ravi.v.shankar@...el.com>
Link: https://lkml.kernel.org/r/20190623132434.754768274@linutronix.de
---
arch/x86/kernel/hpet.c | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
index 638aaff39819..cb120e412dc6 100644
--- a/arch/x86/kernel/hpet.c
+++ b/arch/x86/kernel/hpet.c
@@ -692,16 +692,10 @@ static int hpet_cpuhp_dead(unsigned int cpu)
}
#else
-static void hpet_msi_capability_lookup(unsigned int start_timer)
-{
- return;
-}
+static inline void hpet_msi_capability_lookup(unsigned int start_timer) { }
#ifdef CONFIG_HPET
-static void hpet_reserve_msi_timers(struct hpet_data *hd)
-{
- return;
-}
+static inline void hpet_reserve_msi_timers(struct hpet_data *hd) { }
#endif
#define hpet_cpuhp_online NULL
@@ -820,7 +814,7 @@ static struct clocksource clocksource_hpet = {
.resume = hpet_resume_counter,
};
-static int hpet_clocksource_register(void)
+static int __init hpet_clocksource_register(void)
{
u64 start, now;
u64 t1;
Powered by blists - more mailing lists