Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751785AbdCPFay (ORCPT ); Thu, 16 Mar 2017 01:30:54 -0400 Received: from mail-pg0-f45.google.com ([74.125.83.45]:35412 "EHLO mail-pg0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751764AbdCPFat (ORCPT ); Thu, 16 Mar 2017 01:30:49 -0400 From: Viresh Kumar To: Rafael Wysocki , Javi Merino , Zhang Rui , Eduardo Valentin , Amit Daniel Kachhap , Viresh Kumar Cc: linaro-kernel@lists.linaro.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, Vincent Guittot Subject: [PATCH 16/17] thermal: cpu_cooling: 'freq' can't be zero in cpufreq_state2power() Date: Thu, 16 Mar 2017 10:59:51 +0530 Message-Id: <252aef1977bab800768c5144e907f8d0696323a9.1489640000.git.viresh.kumar@linaro.org> 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 List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1095 Lines: 32 The frequency table shouldn't have any zero frequency entries and so such a check isn't required. Though it would be better to make sure 'state' is within limits. Signed-off-by: Viresh Kumar --- drivers/thermal/cpu_cooling.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/thermal/cpu_cooling.c b/drivers/thermal/cpu_cooling.c index fb535fd5aa12..768a95bcc392 100644 --- a/drivers/thermal/cpu_cooling.c +++ b/drivers/thermal/cpu_cooling.c @@ -561,12 +561,13 @@ static int cpufreq_state2power(struct thermal_cooling_device *cdev, int ret; struct cpufreq_cooling_device *cpufreq_dev = cdev->devdata; + /* Request state should be less than max_level */ + if (WARN_ON(state > cpufreq_dev->max_level)) + return -EINVAL; + num_cpus = cpumask_weight(cpufreq_dev->policy->cpus); freq = cpufreq_dev->freq_table[state].frequency; - if (!freq) - return -EINVAL; - dynamic_power = cpu_freq_to_power(cpufreq_dev, freq) * num_cpus; ret = get_static_power(cpufreq_dev, tz, freq, &static_power); if (ret) -- 2.7.1.410.g6faf27b