From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Tue, 9 Mar 2021 16:06:52 +0000 (+0300)
Subject: w1: w1_therm: use clamp() in int_to_short()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=199c4d0efe7d9e5ed0036efeeb8ddb862dafe09a;p=linux.git

w1: w1_therm: use clamp() in int_to_short()

It's slightly cleaner to use the clamp() macro instead of open coding
this.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Link: https://lore.kernel.org/r/YEedHNwqEH8fvjkD@mwanda
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/w1/slaves/w1_therm.c b/drivers/w1/slaves/w1_therm.c
index 976eea28f268a..ad47c164bc051 100644
--- a/drivers/w1/slaves/w1_therm.c
+++ b/drivers/w1/slaves/w1_therm.c
@@ -906,8 +906,7 @@ static inline int temperature_from_RAM(struct w1_slave *sl, u8 rom[9])
 static inline s8 int_to_short(int i)
 {
 	/* Prepare to cast to short by eliminating out of range values */
-	i = i > MAX_TEMP ? MAX_TEMP : i;
-	i = i < MIN_TEMP ? MIN_TEMP : i;
+	i = clamp(i, MIN_TEMP, MAX_TEMP);
 	return (s8) i;
 }