From: tip-bot for Luiz Capitulino <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: lcapitulino@redhat.com, tglx@linutronix.de, hpa@zytor.com,
linux-kernel@vger.kernel.org, mingo@kernel.org
Subject: [tip:timers/core] hrtimer: Drop return code of hrtimer_switch_to_hres()
Date: Mon, 17 Aug 2015 14:45:21 -0700 [thread overview]
Message-ID: <tip-75e3b37d059856a972a5bf2bdfeac0f0f2db9ea3@git.kernel.org> (raw)
In-Reply-To: <20150811164043.538241ef@redhat.com>
Commit-ID: 75e3b37d059856a972a5bf2bdfeac0f0f2db9ea3
Gitweb: http://git.kernel.org/tip/75e3b37d059856a972a5bf2bdfeac0f0f2db9ea3
Author: Luiz Capitulino <lcapitulino@redhat.com>
AuthorDate: Tue, 11 Aug 2015 16:40:43 -0400
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitDate: Mon, 17 Aug 2015 23:19:03 +0200
hrtimer: Drop return code of hrtimer_switch_to_hres()
It's not checked by the caller.
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Link: http://lkml.kernel.org/r/20150811164043.538241ef@redhat.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
kernel/time/hrtimer.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
index 5c7ae4b..55575d4 100644
--- a/kernel/time/hrtimer.c
+++ b/kernel/time/hrtimer.c
@@ -679,14 +679,13 @@ static void retrigger_next_event(void *arg)
/*
* Switch to high resolution mode
*/
-static int hrtimer_switch_to_hres(void)
+static void hrtimer_switch_to_hres(void)
{
struct hrtimer_cpu_base *base = this_cpu_ptr(&hrtimer_bases);
if (tick_init_highres()) {
printk(KERN_WARNING "Could not switch to high resolution "
"mode on CPU %d\n", base->cpu);
- return 0;
}
base->hres_active = 1;
hrtimer_resolution = HIGH_RES_NSEC;
@@ -694,7 +693,6 @@ static int hrtimer_switch_to_hres(void)
tick_setup_sched_timer();
/* "Retrigger" the interrupt to get things going */
retrigger_next_event(NULL);
- return 1;
}
static void clock_was_set_work(struct work_struct *work)
@@ -718,7 +716,7 @@ void clock_was_set_delayed(void)
static inline int __hrtimer_hres_active(struct hrtimer_cpu_base *b) { return 0; }
static inline int hrtimer_hres_active(void) { return 0; }
static inline int hrtimer_is_hres_enabled(void) { return 0; }
-static inline int hrtimer_switch_to_hres(void) { return 0; }
+static inline void hrtimer_switch_to_hres(void) { }
static inline void
hrtimer_force_reprogram(struct hrtimer_cpu_base *base, int skip_equal) { }
static inline int hrtimer_reprogram(struct hrtimer *timer,
prev parent reply other threads:[~2015-08-17 21:45 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-11 20:40 [PATCH] hrtimer: hrtimer_switch_to_hres(): drop return code Luiz Capitulino
2015-08-17 21:45 ` tip-bot for Luiz Capitulino [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-75e3b37d059856a972a5bf2bdfeac0f0f2db9ea3@git.kernel.org \
--to=tipbot@zytor.com \
--cc=hpa@zytor.com \
--cc=lcapitulino@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome