PM / devfreq: Drop custom MIN/MAX macros

Message ID 20180424194639.22804-1-bjorn.andersson@linaro.org
State New
Headers show
Series
  • PM / devfreq: Drop custom MIN/MAX macros
Related show

Commit Message

Bjorn Andersson April 24, 2018, 7:46 p.m.
Drop the custom MIN/MAX macros in favour of the standard min/max from
kernel.h

Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

---
 drivers/devfreq/devfreq.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

-- 
2.16.2

Comments

Chanwoo Choi May 8, 2018, 4:49 a.m. | #1
Hi,

On 2018년 04월 25일 04:46, Bjorn Andersson wrote:
> Drop the custom MIN/MAX macros in favour of the standard min/max from

> kernel.h

> 

> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

> ---

>  drivers/devfreq/devfreq.c | 11 ++++-------

>  1 file changed, 4 insertions(+), 7 deletions(-)

> 

> diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c

> index fe2af6aa88fc..2067cd229ce3 100644

> --- a/drivers/devfreq/devfreq.c

> +++ b/drivers/devfreq/devfreq.c

> @@ -28,9 +28,6 @@

>  #include <linux/of.h>

>  #include "governor.h"

>  

> -#define MAX(a,b)	((a > b) ? a : b)

> -#define MIN(a,b)	((a < b) ? a : b)

> -

>  static struct class *devfreq_class;

>  

>  /*

> @@ -280,8 +277,8 @@ int update_devfreq(struct devfreq *devfreq)

>  	 * max_freq

>  	 * min_freq

>  	 */

> -	max_freq = MIN(devfreq->scaling_max_freq, devfreq->max_freq);

> -	min_freq = MAX(devfreq->scaling_min_freq, devfreq->min_freq);

> +	max_freq = min(devfreq->scaling_max_freq, devfreq->max_freq);

> +	min_freq = max(devfreq->scaling_min_freq, devfreq->min_freq);

>  

>  	if (min_freq && freq < min_freq) {

>  		freq = min_freq;

> @@ -1149,7 +1146,7 @@ static ssize_t min_freq_show(struct device *dev, struct device_attribute *attr,

>  {

>  	struct devfreq *df = to_devfreq(dev);

>  

> -	return sprintf(buf, "%lu\n", MAX(df->scaling_min_freq, df->min_freq));

> +	return sprintf(buf, "%lu\n", max(df->scaling_min_freq, df->min_freq));

>  }

>  

>  static ssize_t max_freq_store(struct device *dev, struct device_attribute *attr,

> @@ -1185,7 +1182,7 @@ static ssize_t max_freq_show(struct device *dev, struct device_attribute *attr,

>  {

>  	struct devfreq *df = to_devfreq(dev);

>  

> -	return sprintf(buf, "%lu\n", MIN(df->scaling_max_freq, df->max_freq));

> +	return sprintf(buf, "%lu\n", min(df->scaling_max_freq, df->max_freq));

>  }

>  static DEVICE_ATTR_RW(max_freq);

>  

> 


Reviewed-by: Chanwoo Choi <cw00.choi@samsung.com>


-- 
Best Regards,
Chanwoo Choi
Samsung Electronics

Patch

diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
index fe2af6aa88fc..2067cd229ce3 100644
--- a/drivers/devfreq/devfreq.c
+++ b/drivers/devfreq/devfreq.c
@@ -28,9 +28,6 @@ 
 #include <linux/of.h>
 #include "governor.h"
 
-#define MAX(a,b)	((a > b) ? a : b)
-#define MIN(a,b)	((a < b) ? a : b)
-
 static struct class *devfreq_class;
 
 /*
@@ -280,8 +277,8 @@  int update_devfreq(struct devfreq *devfreq)
 	 * max_freq
 	 * min_freq
 	 */
-	max_freq = MIN(devfreq->scaling_max_freq, devfreq->max_freq);
-	min_freq = MAX(devfreq->scaling_min_freq, devfreq->min_freq);
+	max_freq = min(devfreq->scaling_max_freq, devfreq->max_freq);
+	min_freq = max(devfreq->scaling_min_freq, devfreq->min_freq);
 
 	if (min_freq && freq < min_freq) {
 		freq = min_freq;
@@ -1149,7 +1146,7 @@  static ssize_t min_freq_show(struct device *dev, struct device_attribute *attr,
 {
 	struct devfreq *df = to_devfreq(dev);
 
-	return sprintf(buf, "%lu\n", MAX(df->scaling_min_freq, df->min_freq));
+	return sprintf(buf, "%lu\n", max(df->scaling_min_freq, df->min_freq));
 }
 
 static ssize_t max_freq_store(struct device *dev, struct device_attribute *attr,
@@ -1185,7 +1182,7 @@  static ssize_t max_freq_show(struct device *dev, struct device_attribute *attr,
 {
 	struct devfreq *df = to_devfreq(dev);
 
-	return sprintf(buf, "%lu\n", MIN(df->scaling_max_freq, df->max_freq));
+	return sprintf(buf, "%lu\n", min(df->scaling_max_freq, df->max_freq));
 }
 static DEVICE_ATTR_RW(max_freq);