@@ -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))
@@ -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()))
@@ -263,16 +267,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.
*/
@@ -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);
tick_check_replacement() is now nothing more than a wrapper over tick_check_preferred() and hence can be removed. Use tick_check_preferred() everywhere. 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(-)