From: David Frey <dpfrey@gmail.com>
Date: Fri, 17 Aug 2018 19:03:13 +0000 (-0700)
Subject: iio: chemical: bme680: use clamp macro
X-Git-Tag: v5.4-rc1~2324^2~380^2~58
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8a0ae7d83aa8427fd264404da3045994521b621f;p=platform%2Fkernel%2Flinux-rpi.git

iio: chemical: bme680: use clamp macro

Signed-off-by: David Frey <dpfrey@gmail.com>
Reviewed-by: Himanshu Jha <himanshujha199640@gmail.com>
Tested-by: Himanshu Jha <himanshujha199640@gmail.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
---

diff --git a/drivers/iio/chemical/bme680_core.c b/drivers/iio/chemical/bme680_core.c
index 5de9e27c914a..4d98c2155810 100644
--- a/drivers/iio/chemical/bme680_core.c
+++ b/drivers/iio/chemical/bme680_core.c
@@ -408,10 +408,7 @@ static u32 bme680_compensate_humid(struct bme680_data *data,
 	var6 = (var4 * var5) >> 1;
 	calc_hum = (((var3 + var6) >> 10) * 1000) >> 12;
 
-	if (calc_hum > 100000) /* Cap at 100%rH */
-		calc_hum = 100000;
-	else if (calc_hum < 0)
-		calc_hum = 0;
+	calc_hum = clamp(calc_hum, 0, 100000); /* clamp between 0-100 %rH */
 
 	return calc_hum;
 }