From 59fe675248ffc37d4167e9ec6920a2f3d5ec67bb Mon Sep 17 00:00:00 2001 From: Valentin Schneider Date: Wed, 11 Dec 2019 11:38:47 +0000 Subject: [PATCH] sched/uclamp: Remove uclamp_util() The sole user of uclamp_util(), schedutil_cpu_util(), was made to use uclamp_util_with() instead in commit: af24bde8df20 ("sched/uclamp: Add uclamp support to energy_compute()") From then on, uclamp_util() has remained unused. Being a simple wrapper around uclamp_util_with(), we can get rid of it and win back a few lines. Tested-By: Dietmar Eggemann Suggested-by: Dietmar Eggemann Signed-off-by: Valentin Schneider Signed-off-by: Peter Zijlstra (Intel) Reviewed-by: Dietmar Eggemann Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Link: https://lkml.kernel.org/r/20191211113851.24241-2-valentin.schneider@arm.com Signed-off-by: Ingo Molnar --- kernel/sched/sched.h | 9 --------- 1 file changed, 9 deletions(-) diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 280a3c735935..d9b24513d71d 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -2324,21 +2324,12 @@ unsigned int uclamp_util_with(struct rq *rq, unsigned int util, return clamp(util, min_util, max_util); } - -static inline unsigned int uclamp_util(struct rq *rq, unsigned int util) -{ - return uclamp_util_with(rq, util, NULL); -} #else /* CONFIG_UCLAMP_TASK */ static inline unsigned int uclamp_util_with(struct rq *rq, unsigned int util, struct task_struct *p) { return util; } -static inline unsigned int uclamp_util(struct rq *rq, unsigned int util) -{ - return util; -} #endif /* CONFIG_UCLAMP_TASK */ #ifdef arch_scale_freq_capacity