renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-14 08:13:56 +08:00
Code

clockevents: Remove unnecessary unlikely()

Browse Source 
WARN_ON() and WARN_ON_ONCE() already contains an unlikely(), so it's not
necessary to use unlikely.

Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lkml.kernel.org/r/20181104023104.2572-1-tiny.windzz@gmail.com
This commit is contained in:
Yangtao Li 2018-11-03 22:31:04 -04:00 committed by Thomas Gleixner
parent 651022382c
commit 7d9df98be6
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
kernel/time/clockevents.c
View File

@ -39,10 +39,8 @@ static u64 cev_delta2ns(unsigned long latch, struct clock_event_device *evt,
u64 clc = (u64) latch << evt->shift;
u64 rnd;
if (unlikely(!evt->mult)) {
if (WARN_ON(!evt->mult))
evt->mult = 1;
WARN_ON(1);
}
rnd = (u64) evt->mult - 1;
/*
@ -164,10 +162,8 @@ void clockevents_switch_state(struct clock_event_device *dev,
* on it, so fix it up and emit a warning:
*/
if (clockevent_state_oneshot(dev)) {
if (unlikely(!dev->mult)) {
if (WARN_ON(!dev->mult))
dev->mult = 1;
WARN_ON(1);
}
}
}
}
@ -315,10 +311,8 @@ int clockevents_program_event(struct clock_event_device *dev, ktime_t expires,
int64_t delta;
int rc;
if (unlikely(expires < 0)) {
WARN_ON_ONCE(1);
if (WARN_ON_ONCE(expires < 0))
return -ETIME;
}
dev->next_event = expires;