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

diff --git a/kernel/time/tick-common.c b/kernel/time/tick-common.c
index 9d3a22510babb2f18770ecdcf0e473198e92066b..e15bc0ef191282561eaae1e9c91e851d692e54b6 100644 (file)
--- 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))