clockevents: Remove unnecessary unlikely() (7d9df98b) · Commits · 戴 / test

WARN_ON() and WARN_ON_ONCE() already contains an unlikely(), so it's not necessary to use unlikely. Signed-off-by:

kernel/time/clockevents.c

+3 −9

Original line number	Diff line number	Diff line
		@@ -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;