Skip to contentSkip to conversation

clockevents: remove unnecessary unlikely()

PATCH New Yangtao Li 2 participants 2 messages Nov 4, 2018 – Nov 5, 2018 High-resolution timers, timer wheel, clockevents

lore
Share & tools
lore

Yangtao Li

author
#0 lore raw

PATCH 1/1 clockevents: remove unnecessary unlikely()

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

Signed-off-by Yangtao Li <[email protected]>
---
 kernel/time/clockevents.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)
kernel/time/clockevents.c +3 -9
index 8c0e4092f661..af58898d9ebf 100644
@@ -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;
Signature · 1 line
2.17.0
merge bot
#1 lore raw

[tip:timers/core] clockevents: Remove unnecessary unlikely()

clockevents: Remove unnecessary unlikely()
Commit-ID:  7d9df98be66fec64349f9f1c9d3e896293fe7b45
Gitweb:     https://git.kernel.org/tip/7d9df98be66fec64349f9f1c9d3e896293fe7b45
Author:     Yangtao Li <[email protected]>
AuthorDate: Sat, 3 Nov 2018 22:31:04 -0400
Committer:  Thomas Gleixner <[email protected]>
CommitDate: Mon, 5 Nov 2018 14:22:54 +0100

clockevents: Remove unnecessary unlikely()

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

Signed-off-by Yangtao Li <[email protected]>
Signed-off-by Thomas Gleixner <[email protected]>
Link https://lkml.kernel.org/r/[email protected] open here
---
 kernel/time/clockevents.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)
kernel/time/clockevents.c +3 -9
index 8c0e4092f661..af58898d9ebf 100644
@@ -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;