summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWang Wensheng <wangwensheng4@huawei.com>2021-03-26 03:23:28 +0100
committerThomas Gleixner <tglx@linutronix.de>2021-04-16 21:03:50 +0200
commitd7840aaadd6e84915866a8f0dab586f6107dadf1 (patch)
tree1c538c7b94fcd5af6d2335e7fc95dda6895c5cf1
parenttime/timecounter: Mark 1st argument of timecounter_cyc2time() as const (diff)
downloadlinux-d7840aaadd6e84915866a8f0dab586f6107dadf1.tar.xz
linux-d7840aaadd6e84915866a8f0dab586f6107dadf1.zip
tick: Use tick_check_replacement() instead of open coding it
The function tick_check_replacement() is the combination of tick_check_percpu() and tick_check_preferred(), but tick_check_new_device() has the same logic open coded. Use the helper to simplify the code. [ tglx: Massage changelog ] Signed-off-by: Wang Wensheng <wangwensheng4@huawei.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Link: https://lore.kernel.org/r/20210326022328.3266-1-wangwensheng4@huawei.com
-rw-r--r--kernel/time/tick-common.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/kernel/time/tick-common.c b/kernel/time/tick-common.c
index 9d3a22510bab..e15bc0ef1912 100644
--- a/kernel/time/tick-common.c
+++ b/kernel/time/tick-common.c
@@ -348,12 +348,7 @@ void tick_check_new_device(struct clock_event_device *newdev)
td = &per_cpu(tick_cpu_device, cpu);
curdev = td->evtdev;
- /* cpu local device ? */
- if (!tick_check_percpu(curdev, newdev, cpu))
- goto out_bc;
-
- /* Preference decision */
- if (!tick_check_preferred(curdev, newdev))
+ if (!tick_check_replacement(curdev, newdev))
goto out_bc;
if (!try_module_get(newdev->owner))