From patchwork Thu Mar 16 05:29:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 95385 Delivered-To: patch@linaro.org Received: by 10.140.89.134 with SMTP id v6csp661018qgd; Wed, 15 Mar 2017 22:31:39 -0700 (PDT) X-Received: by 10.99.7.206 with SMTP id 197mr7869993pgh.95.1489642298951; Wed, 15 Mar 2017 22:31:38 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z62si4145225pgb.391.2017.03.15.22.31.38; Wed, 15 Mar 2017 22:31:38 -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 sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751839AbdCPFbi (ORCPT + 25 others); Thu, 16 Mar 2017 01:31:38 -0400 Received: from mail-pg0-f53.google.com ([74.125.83.53]:36189 "EHLO mail-pg0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751749AbdCPFas (ORCPT ); Thu, 16 Mar 2017 01:30:48 -0400 Received: by mail-pg0-f53.google.com with SMTP id g2so19547539pge.3 for ; Wed, 15 Mar 2017 22:30:47 -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=nTw5v5AeuXN2aR49ft8AryYj59Cyy1Z3/RPE5hydpxo=; b=MPn3Cqj2qa70RmUb987wJUF8yvkqyeDSWmDd3YBljY6ikpbcc72fqyR6sB53gMiXzn XuU7U9m1oUW7Fvp4lqPUs2XJlSDq1uOuAPiyxE6+MQapiUl9gQ+D33A6VFKA4Jm5Ak9D V/N+56MNn6OHuk7K8nWQqDYWVoCAbTIWr5RiY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=nTw5v5AeuXN2aR49ft8AryYj59Cyy1Z3/RPE5hydpxo=; b=th9X7F8hyBoSbeKJpKSqGUj1D0iaJOrPnj7JHA1Q/96GmQqKyGAJmTpNfhHYCitz2J CHmpxPw/1lnAuoeVdYDhUSDP7qyI5TdJX+0FgjKB3OzP3QX+2O3WUpfwwb6mZuxFLTAG 5QpHQ3l4jLVFt47G+YgCBl1IyTr0OvtQRdiY3w2qGkCHSg6LIKySWDYISlpsCbwCr3Co sefiYkwLrvQvz2pEkjXdRRkKaSYNpzARzgwWX6puJqZdI2oJvUOEg7aJn08VA9k0gbkQ 8nyQu5kLVylSKGA105FugKQ5GLUfGZPoTRJVfpu74sfYRskut6Nxuq1vbgWQuqcokU1B hz7g== X-Gm-Message-State: AFeK/H0wgzpsi3cKMqoUhNW4WoyGWD16oeEmrQv0EkK1vEtKHwPi31nvnQhoPW/kkKNPwfvI X-Received: by 10.99.129.200 with SMTP id t191mr8206413pgd.41.1489642242297; Wed, 15 Mar 2017 22:30:42 -0700 (PDT) Received: from localhost ([122.171.239.200]) by smtp.gmail.com with ESMTPSA id m6sm7406776pfm.22.2017.03.15.22.30.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Mar 2017 22:30:41 -0700 (PDT) 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 14/17] thermal: cpu_cooling: get_level() can't fail Date: Thu, 16 Mar 2017 10:59:49 +0530 Message-Id: <670bd7723463c1a8e45bb9fb1c40b7a6e3ee73e0.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 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The frequency passed to get_level() is returned by cpu_power_to_freq() and it is guaranteed that get_level() can't fail. Get rid of error code. Signed-off-by: Viresh Kumar --- drivers/thermal/cpu_cooling.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) -- 2.7.1.410.g6faf27b diff --git a/drivers/thermal/cpu_cooling.c b/drivers/thermal/cpu_cooling.c index 69388a903706..fd84802d2e8e 100644 --- a/drivers/thermal/cpu_cooling.c +++ b/drivers/thermal/cpu_cooling.c @@ -120,22 +120,19 @@ static LIST_HEAD(cpufreq_dev_list); * @cpufreq_dev: cpufreq_dev for which the property is required * @freq: Frequency * - * Return: level on success, THERMAL_CSTATE_INVALID on error. + * Return: level corresponding to the frequency. */ static unsigned long get_level(struct cpufreq_cooling_device *cpufreq_dev, unsigned int freq) { + struct freq_table *freq_table = cpufreq_dev->freq_table; unsigned long level; - for (level = 0; level <= cpufreq_dev->max_level; level++) { - if (freq == cpufreq_dev->freq_table[level].frequency) - return level; - - if (freq > cpufreq_dev->freq_table[level].frequency) + for (level = 1; level < cpufreq_dev->max_level; level++) + if (freq > freq_table[level].frequency) break; - } - return THERMAL_CSTATE_INVALID; + return level - 1; } /** @@ -624,13 +621,6 @@ static int cpufreq_power2state(struct thermal_cooling_device *cdev, target_freq = cpu_power_to_freq(cpufreq_dev, normalised_power); *state = get_level(cpufreq_dev, target_freq); - if (*state == THERMAL_CSTATE_INVALID) { - dev_err_ratelimited(&cdev->device, - "Failed to convert %dKHz for cpu %d into a cdev state\n", - target_freq, policy->cpu); - return -EINVAL; - } - trace_thermal_power_cpu_limit(policy->related_cpus, target_freq, *state, power); return 0;