From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3ECDDC17441 for ; Wed, 13 Nov 2019 00:11:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 219012196E for ; Wed, 13 Nov 2019 00:11:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727064AbfKMALi (ORCPT ); Tue, 12 Nov 2019 19:11:38 -0500 Received: from cloudserver094114.home.pl ([79.96.170.134]:61985 "EHLO cloudserver094114.home.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726973AbfKMALi (ORCPT ); Tue, 12 Nov 2019 19:11:38 -0500 Received: from 79.184.253.153.ipv4.supernova.orange.pl (79.184.253.153) (HELO kreacher.localnet) by serwer1319399.home.pl (79.96.170.134) with SMTP (IdeaSmtpServer 0.83.292) id 0fe9b4f92c5da7e6; Wed, 13 Nov 2019 01:11:35 +0100 From: "Rafael J. Wysocki" To: Linux PM Cc: LKML , Doug Smythies Subject: [PATCH 3/3] cpuidle: teo: Avoid code duplication in conditionals Date: Wed, 13 Nov 2019 01:10:13 +0100 Message-ID: <3101916.xHKGgMp4rb@kreacher> In-Reply-To: <13588000.TfE7eV4KYW@kreacher> References: <13588000.TfE7eV4KYW@kreacher> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org From: Rafael J. Wysocki There are three places in teo_select() where a given amount of time is compared with TICK_NSEC if tick_nohz_tick_stopped() returns true, which is a bit of duplicated code. Avoid that code duplication by defining a helper function to do the check and using it in all of the places in question. No intentional functional impact. Signed-off-by: Rafael J. Wysocki --- drivers/cpuidle/governors/teo.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) Index: linux-pm/drivers/cpuidle/governors/teo.c =================================================================== --- linux-pm.orig/drivers/cpuidle/governors/teo.c +++ linux-pm/drivers/cpuidle/governors/teo.c @@ -202,6 +202,11 @@ static void teo_update(struct cpuidle_dr cpu_data->interval_idx = 0; } +static bool teo_time_ok(u64 interval_ns) +{ + return !tick_nohz_tick_stopped() || interval_ns >= TICK_NSEC; +} + /** * teo_find_shallower_state - Find shallower idle state matching given duration. * @drv: cpuidle driver containing state data. @@ -306,8 +311,7 @@ static int teo_select(struct cpuidle_dri * check if the current candidate state is not too * shallow for that role. */ - if (!(tick_nohz_tick_stopped() && - drv->states[idx].target_residency_ns < TICK_NSEC)) { + if (teo_time_ok(drv->states[idx].target_residency_ns)) { prev_max_early_idx = max_early_idx; early_hits = cpu_data->states[i].early_hits; max_early_idx = idx; @@ -333,8 +337,7 @@ static int teo_select(struct cpuidle_dri misses = cpu_data->states[i].misses; if (early_hits < cpu_data->states[i].early_hits && - !(tick_nohz_tick_stopped() && - drv->states[i].target_residency_ns < TICK_NSEC)) { + teo_time_ok(drv->states[i].target_residency_ns)) { prev_max_early_idx = max_early_idx; early_hits = cpu_data->states[i].early_hits; max_early_idx = i; @@ -409,7 +412,7 @@ static int teo_select(struct cpuidle_dri * Avoid spending too much time in an idle state that * would be too shallow. */ - if (!(tick_nohz_tick_stopped() && avg_ns < TICK_NSEC)) { + if (teo_time_ok(avg_ns)) { duration_ns = avg_ns; if (drv->states[idx].target_residency_ns > avg_ns) idx = teo_find_shallower_state(drv, dev,