All patches automatically rebased Build system: x86_64 Build-tested: bcm2711/RPi4B, mt7622/RT3200 Run-tested: bcm2711/RPi4B, mt7622/RT3200 Signed-off-by: John Audia <therealgraysky@proton.me>
		
			
				
	
	
		
			34 lines
		
	
	
		
			1.0 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			34 lines
		
	
	
		
			1.0 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
From dbd88e6fdd547cf8f6765b8dade9f89cf5c0ead9 Mon Sep 17 00:00:00 2001
 | 
						|
From: Maxime Ripard <maxime@cerno.tech>
 | 
						|
Date: Mon, 17 Jan 2022 16:38:10 +0100
 | 
						|
Subject: [PATCH] clk: Use clamp instead of open-coding our own
 | 
						|
 | 
						|
The code in clk_set_rate_range() will, if the current rate is outside of
 | 
						|
the new range, force it to the minimum or maximum.
 | 
						|
 | 
						|
Since it's running under the condition that the rate is either lower
 | 
						|
than the minimum, or higher than the maximum, this is equivalent to
 | 
						|
using clamp, while being less readable. Let's switch to using clamp
 | 
						|
instead.
 | 
						|
 | 
						|
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
 | 
						|
---
 | 
						|
 drivers/clk/clk.c | 6 +-----
 | 
						|
 1 file changed, 1 insertion(+), 5 deletions(-)
 | 
						|
 | 
						|
--- a/drivers/clk/clk.c
 | 
						|
+++ b/drivers/clk/clk.c
 | 
						|
@@ -2386,11 +2386,7 @@ int clk_set_rate_range(struct clk *clk,
 | 
						|
 		 *   this corner case when determining the rate
 | 
						|
 		 */
 | 
						|
 
 | 
						|
-		if (rate < min)
 | 
						|
-			rate = min;
 | 
						|
-		else
 | 
						|
-			rate = max;
 | 
						|
-
 | 
						|
+		rate = clamp(clk->core->req_rate, min, max);
 | 
						|
 		ret = clk_core_set_rate_nolock(clk->core, rate);
 | 
						|
 		if (ret) {
 | 
						|
 			/* rollback the changes */
 |