From patchwork Fri Jun 3 05:28:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 69224 Delivered-To: patch@linaro.org Received: by 10.140.106.246 with SMTP id e109csp91067qgf; Thu, 2 Jun 2016 22:30:40 -0700 (PDT) X-Received: by 10.98.43.209 with SMTP id r200mr3646186pfr.24.1464931840011; Thu, 02 Jun 2016 22:30:40 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 185si5255853pfb.30.2016.06.02.22.30.39; Thu, 02 Jun 2016 22:30:40 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751926AbcFCFah (ORCPT + 31 others); Fri, 3 Jun 2016 01:30:37 -0400 Received: from mail-pa0-f54.google.com ([209.85.220.54]:33288 "EHLO mail-pa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751884AbcFCF3P (ORCPT ); Fri, 3 Jun 2016 01:29:15 -0400 Received: by mail-pa0-f54.google.com with SMTP id ec8so5532205pac.0 for ; Thu, 02 Jun 2016 22:29:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=WuD3ZSI2WiXtx7dL/98VVAuockusF6eRu+FfWjohU0c=; b=eH0gDx1tXjtlk8Xkydc1ffp4dl3Ab4AqMkIDOEW7pImwMjJwMkorIUwPDanLYd1eSM dT8ADW/wy54WW7nK/QXu4RfmMTzTMkGjbD+gb4tmZg7MS18BAeGYeDqupgMTrikrlNng uzoJF4qShDY7Tw47lkdYu+mIgB2VxMs3vyYW4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=WuD3ZSI2WiXtx7dL/98VVAuockusF6eRu+FfWjohU0c=; b=jBFjC9ilyT4CCE9ntcJGPPLmsfImdWKJhzSSYb5rfCMZDjS+wKRuH0M6vKYyt1wAQB KmcBDPHX3dUXgl0eUeFdV8Ue6Gd9AO1SoyCgFAGo20wllPe6dUYsGNZ0jMuSHTyhXHZa /mPE/YX3t/d/poB6egYEcpI3Tx/DVGMQkCvk1X/MZqXWKAvADQEdm1z86x0RMOrqKtUx TjdXF3TDxlowDIT/WnKd2Vt4MZtXwmJhJ3QrhPtocokHIO3x2sp1eMteaGYdBviJ7T3+ fq2Ky8Q0gSlchwC0BcSNnUN7oB/3ZsnUHX0J7rQz/UtYKOIPgNz95q6DYfJoM0wnh36k smgg== X-Gm-Message-State: ALyK8tL2jREDQ+lL6iey9sq2J1ahXt375GqTZGNgOV3XD3/+Sd7/sNBKQwSQcLGzJWqRFsZB X-Received: by 10.66.138.16 with SMTP id qm16mr2780687pab.28.1464931754736; Thu, 02 Jun 2016 22:29:14 -0700 (PDT) Received: from localhost ([122.167.17.193]) by smtp.gmail.com with ESMTPSA id 17sm4657876pfj.96.2016.06.02.22.29.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Jun 2016 22:29:14 -0700 (PDT) From: Viresh Kumar To: Rafael Wysocki , Viresh Kumar Cc: linaro-kernel@lists.linaro.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH V3 4/8] cpufreq: ondemand: Don't keep a copy of freq_table pointer Date: Fri, 3 Jun 2016 10:58:48 +0530 Message-Id: X-Mailer: git-send-email 2.7.1.410.g6faf27b In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org There is absolutely no need to keep a copy to the freq-table in 'struct od_policy_dbs_info'. Use policy->freq_table instead. Signed-off-by: Viresh Kumar --- drivers/cpufreq/amd_freq_sensitivity.c | 7 +++---- drivers/cpufreq/cpufreq_ondemand.c | 22 +++++++++++----------- drivers/cpufreq/cpufreq_ondemand.h | 1 - 3 files changed, 14 insertions(+), 16 deletions(-) -- 2.7.1.410.g6faf27b diff --git a/drivers/cpufreq/amd_freq_sensitivity.c b/drivers/cpufreq/amd_freq_sensitivity.c index 404360cad25c..bc86816693a8 100644 --- a/drivers/cpufreq/amd_freq_sensitivity.c +++ b/drivers/cpufreq/amd_freq_sensitivity.c @@ -48,9 +48,8 @@ static unsigned int amd_powersave_bias_target(struct cpufreq_policy *policy, struct policy_dbs_info *policy_dbs = policy->governor_data; struct dbs_data *od_data = policy_dbs->dbs_data; struct od_dbs_tuners *od_tuners = od_data->tuners; - struct od_policy_dbs_info *od_info = to_dbs_info(policy_dbs); - if (!od_info->freq_table) + if (!policy->freq_table) return freq_next; rdmsr_on_cpu(policy->cpu, MSR_AMD64_FREQ_SENSITIVITY_ACTUAL, @@ -93,9 +92,9 @@ static unsigned int amd_powersave_bias_target(struct cpufreq_policy *policy, unsigned int index; cpufreq_frequency_table_target(policy, - od_info->freq_table, policy->cur - 1, + policy->freq_table, policy->cur - 1, CPUFREQ_RELATION_H, &index); - freq_next = od_info->freq_table[index].frequency; + freq_next = policy->freq_table[index].frequency; } data->freq_prev = freq_next; diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c index 4d2fe2710c5d..528353f204fd 100644 --- a/drivers/cpufreq/cpufreq_ondemand.c +++ b/drivers/cpufreq/cpufreq_ondemand.c @@ -71,28 +71,29 @@ static unsigned int generic_powersave_bias_target(struct cpufreq_policy *policy, struct od_policy_dbs_info *dbs_info = to_dbs_info(policy_dbs); struct dbs_data *dbs_data = policy_dbs->dbs_data; struct od_dbs_tuners *od_tuners = dbs_data->tuners; + struct cpufreq_frequency_table *freq_table = policy->freq_table; - if (!dbs_info->freq_table) { + if (!freq_table) { dbs_info->freq_lo = 0; dbs_info->freq_lo_delay_us = 0; return freq_next; } - cpufreq_frequency_table_target(policy, dbs_info->freq_table, freq_next, - relation, &index); - freq_req = dbs_info->freq_table[index].frequency; + cpufreq_frequency_table_target(policy, freq_table, freq_next, relation, + &index); + freq_req = freq_table[index].frequency; freq_reduc = freq_req * od_tuners->powersave_bias / 1000; freq_avg = freq_req - freq_reduc; /* Find freq bounds for freq_avg in freq_table */ index = 0; - cpufreq_frequency_table_target(policy, dbs_info->freq_table, freq_avg, - CPUFREQ_RELATION_H, &index); - freq_lo = dbs_info->freq_table[index].frequency; + cpufreq_frequency_table_target(policy, freq_table, freq_avg, + CPUFREQ_RELATION_H, &index); + freq_lo = freq_table[index].frequency; index = 0; - cpufreq_frequency_table_target(policy, dbs_info->freq_table, freq_avg, - CPUFREQ_RELATION_L, &index); - freq_hi = dbs_info->freq_table[index].frequency; + cpufreq_frequency_table_target(policy, freq_table, freq_avg, + CPUFREQ_RELATION_L, &index); + freq_hi = freq_table[index].frequency; /* Find out how long we have to be in hi and lo freqs */ if (freq_hi == freq_lo) { @@ -113,7 +114,6 @@ static void ondemand_powersave_bias_init(struct cpufreq_policy *policy) { struct od_policy_dbs_info *dbs_info = to_dbs_info(policy->governor_data); - dbs_info->freq_table = policy->freq_table; dbs_info->freq_lo = 0; } diff --git a/drivers/cpufreq/cpufreq_ondemand.h b/drivers/cpufreq/cpufreq_ondemand.h index f0121db3cd9e..640ea4e97106 100644 --- a/drivers/cpufreq/cpufreq_ondemand.h +++ b/drivers/cpufreq/cpufreq_ondemand.h @@ -13,7 +13,6 @@ struct od_policy_dbs_info { struct policy_dbs_info policy_dbs; - struct cpufreq_frequency_table *freq_table; unsigned int freq_lo; unsigned int freq_lo_delay_us; unsigned int freq_hi_delay_us;