From 6966eb9ecfb621025654b011659ee058c21e235d Mon Sep 17 00:00:00 2001 From: Valentin Schneider Date: Wed, 11 Dec 2019 11:38:47 +0000 Subject: [PATCH] BACKPORT: 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. [QP: fixed trivial cherry-pick conflict caused by uclamp_boosted()] Bug: 120440300 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 (cherry picked from commit 59fe675248ffc37d4167e9ec6920a2f3d5ec67bb) Signed-off-by: Quentin Perret Change-Id: I85c97644dbb3172cb9a661c5f0b9af43dfe9c87f --- kernel/sched/sched.h | 9 --------- 1 file changed, 9 deletions(-) diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 2f15633dc7a4..207bfe6e6f4d 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -2353,11 +2353,6 @@ 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); -} - static inline bool uclamp_boosted(struct task_struct *p) { return uclamp_eff_value(p, UCLAMP_MIN) > 0; @@ -2368,10 +2363,6 @@ static inline unsigned int uclamp_util_with(struct rq *rq, unsigned int util, { return util; } -static inline unsigned int uclamp_util(struct rq *rq, unsigned int util) -{ - return util; -} static inline bool uclamp_boosted(struct task_struct *p) { return false;