From: Viresh Kumar <viresh.kumar@linaro.org>
To: tglx@linutronix.de
Cc: linaro-kernel@lists.linaro.org, linaro-networking@linaro.org,
linux-kernel@vger.kernel.org, fweisbec@gmail.com,
Viresh Kumar <viresh.kumar@linaro.org>
Subject: [PATCH V2 11/19] tick-common: remove tick_check_replacement()
Date: Mon, 21 Apr 2014 15:25:07 +0530 [thread overview]
Message-ID: <03a6046b4db8c6587f75775b274e2fd3655a550c.1398072824.git.viresh.kumar@linaro.org> (raw)
In-Reply-To: <cover.1398072824.git.viresh.kumar@linaro.org>
In-Reply-To: <cover.1398072824.git.viresh.kumar@linaro.org>
tick_check_replacement() is now nothing more than a dummy wrapper over
tick_check_preferred() and can be removed.
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
---
kernel/time/clockevents.c | 2 +-
kernel/time/tick-common.c | 16 +++++-----------
kernel/time/tick-internal.h | 2 +-
3 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/kernel/time/clockevents.c b/kernel/time/clockevents.c
index a3e9333..15ff71d 100644
--- a/kernel/time/clockevents.c
+++ b/kernel/time/clockevents.c
@@ -298,7 +298,7 @@ static int clockevents_replace(struct clock_event_device *ced)
if (dev == ced || dev->mode != CLOCK_EVT_MODE_UNUSED)
continue;
- if (!tick_check_replacement(newdev, dev))
+ if (!tick_check_preferred(newdev, dev))
continue;
if (!try_module_get(dev->owner))
diff --git a/kernel/time/tick-common.c b/kernel/time/tick-common.c
index 9d3106b..896c992 100644
--- a/kernel/time/tick-common.c
+++ b/kernel/time/tick-common.c
@@ -230,7 +230,11 @@ static bool tick_check_percpu(struct clock_event_device *curdev,
return true;
}
-static bool tick_check_preferred(struct clock_event_device *curdev,
+/*
+ * Check whether the new device is a better fit than curdev. curdev
+ * can be NULL !
+ */
+bool tick_check_preferred(struct clock_event_device *curdev,
struct clock_event_device *newdev)
{
if (!tick_check_percpu(curdev, newdev, smp_processor_id()))
@@ -254,16 +258,6 @@ static bool tick_check_preferred(struct clock_event_device *curdev,
}
/*
- * Check whether the new device is a better fit than curdev. curdev
- * can be NULL !
- */
-bool tick_check_replacement(struct clock_event_device *curdev,
- struct clock_event_device *newdev)
-{
- return tick_check_preferred(curdev, newdev);
-}
-
-/*
* Check, if the new registered device should be used. Called with
* clockevents_lock held and interrupts disabled.
*/
diff --git a/kernel/time/tick-internal.h b/kernel/time/tick-internal.h
index 65f080a..8c6e85d 100644
--- a/kernel/time/tick-internal.h
+++ b/kernel/time/tick-internal.h
@@ -24,7 +24,7 @@ extern void tick_handover_do_timer(int *cpup);
extern void tick_shutdown(unsigned int *cpup);
extern void tick_suspend(void);
extern void tick_resume(void);
-extern bool tick_check_replacement(struct clock_event_device *curdev,
+extern bool tick_check_preferred(struct clock_event_device *curdev,
struct clock_event_device *newdev);
extern void tick_install_replacement(struct clock_event_device *dev);
--
1.7.12.rc2.18.g61b472e
next prev parent reply other threads:[~2014-04-21 9:59 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-21 9:54 [PATCH V2 00/19] tick: cleanups (Shouldn't change code behavior) Viresh Kumar
2014-04-21 9:54 ` [PATCH V2 01/19] tick: trivial cleanups Viresh Kumar
2014-04-22 21:23 ` Frederic Weisbecker
2014-04-23 4:49 ` Viresh Kumar
2014-04-21 9:54 ` [PATCH V2 02/19] tick: update doc style comments for 'struct tick_sched' Viresh Kumar
2014-04-21 9:54 ` [PATCH V2 03/19] tick: rearrange members of " Viresh Kumar
2014-04-21 9:55 ` [PATCH V2 04/19] tick: move declaration of 'tick_cpu_device' to tick.h Viresh Kumar
2014-04-21 9:55 ` [PATCH V2 05/19] tick: move definition of tick_get_device() " Viresh Kumar
2014-04-21 9:55 ` [PATCH V2 06/19] tick: create tick_get_cpu_device() to get tick_cpu_device on this cpu Viresh Kumar
2014-04-21 9:55 ` [PATCH V2 07/19] tick: initialize variables during their definitions Viresh Kumar
2014-04-21 9:55 ` [PATCH V2 08/19] tick-oneshot: move tick_is_oneshot_available() to tick-oneshot.c Viresh Kumar
2014-04-21 9:55 ` [PATCH V2 09/19] tick-oneshot: remove tick_resume_oneshot() Viresh Kumar
2014-04-21 9:55 ` [PATCH V2 10/19] tick-common: call tick_check_percpu() from tick_check_preferred() Viresh Kumar
2014-04-21 9:55 ` Viresh Kumar [this message]
2014-04-21 9:55 ` [PATCH V2 12/19] tick-common: don't pass 'cpu' & 'cpumask' to tick_setup_device() Viresh Kumar
2014-04-21 9:55 ` [PATCH V2 13/19] tick-common: remove local variable 'broadcast' from tick_resume() Viresh Kumar
2014-04-21 9:55 ` [PATCH V2 14/19] tick-sched: add comment about 'idle_active' in tick_nohz_idle_exit() Viresh Kumar
2014-04-21 23:20 ` Frederic Weisbecker
2014-04-22 4:05 ` viresh kumar
2014-04-21 9:55 ` [PATCH V2 15/19] tick-sched: define 'delta' inside 'if' block in update_ts_time_stats() Viresh Kumar
2014-04-21 9:55 ` [PATCH V2 16/19] tick-sched: remove parameters to {__}tick_nohz_task_switch() routines Viresh Kumar
2014-04-21 9:55 ` [PATCH V2 17/19] tick-sched: remove local variable 'now' from tick_setup_sched_timer() Viresh Kumar
2014-04-21 9:55 ` [PATCH V2 18/19] tick-sched: invert parameter of tick_check_oneshot_change() Viresh Kumar
2014-04-21 9:55 ` [PATCH V2 19/19] tick-sched: rearrange code in tick_do_update_jiffies64() Viresh Kumar
2014-04-30 8:51 ` [PATCH V2 00/19] tick: cleanups (Shouldn't change code behavior) Viresh Kumar
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=03a6046b4db8c6587f75775b274e2fd3655a550c.1398072824.git.viresh.kumar@linaro.org \
--to=viresh.kumar@linaro.org \
--cc=fweisbec@gmail.com \
--cc=linaro-kernel@lists.linaro.org \
--cc=linaro-networking@linaro.org \
--cc=linux-kernel@vger.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;
as well as URLs for NNTP newsgroup(s).