From patchwork Fri Jun 23 09:25:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 106249 Delivered-To: patch@linaro.org Received: by 10.140.91.2 with SMTP id y2csp112192qgd; Fri, 23 Jun 2017 02:25:46 -0700 (PDT) X-Received: by 10.84.143.100 with SMTP id 91mr8002174ply.186.1498209946522; Fri, 23 Jun 2017 02:25:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498209946; cv=none; d=google.com; s=arc-20160816; b=OIhbHi0wk5smmDj7aFWfW6LBH8g89Vt7s6gEB8ChAY4XzS6b+kpdmgZABbAN7pg7bn 7FTqBVpp2d14Haxi5xc79loDZoignCigCnhGDMpX4269NYxSkPQ2ez/ZXNYn4EewL/w3 25s7D9Jr6zZKJpk5LtwYYL/y3W20uZg40Oe4Xbb8JnYGpip9wfupgP88A9SpS1jI7RCH CeKRs2ytE02TI493nfdmIx5oaPPwIUii1JvKWc9/UNsTlhsQFtIjxCihCJY/0ltkqbqH O6IW5fG7fL9sJJcJWRaVO0oH1pH57cGz0PcOcCfDNWOzSc4ocijXpl0aecSrGrUO+neX KwZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=59i8DlrNUCQuB2Lu4XwaZTjkgSkNa/rp8M1nIfMjGE8=; b=DqhRB2wa7mhyQ1v7Srp5o4WD21H40BtBUzFe88rOg+9D7u24aC8YCP6TxADqszCz3G cXdU87wGO7U7ZdmMAHgYRkyPMVkrYRsottF6iyLnt1RS1VgbkRdBzHiSlyN2jJMMlAfQ 1XBSGo0NlEDj6U8SGwIv4f61al2/sRqNowVLLkXbMiMQh4/4F1hyzSfBTs5Dr/Opdu4B Jvw4FG8o4ruK3uYPVBdsPbklE0bHNnKe3p4ooz4/PT+ICxxPVoxqUPadglJI3vky1OBm NETiOD+q2I5gSzIewWar0uwC2PPeBLd20UDyUo7XvyeqKP8ANsyVCmVH4KgTUoufAoMo fUUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.b=YBvZLkXm; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k33si3303439pld.481.2017.06.23.02.25.46; Fri, 23 Jun 2017 02:25:46 -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 header.b=YBvZLkXm; 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 S1754637AbdFWJZp (ORCPT + 25 others); Fri, 23 Jun 2017 05:25:45 -0400 Received: from mail-pg0-f47.google.com ([74.125.83.47]:35782 "EHLO mail-pg0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753694AbdFWJZl (ORCPT ); Fri, 23 Jun 2017 05:25:41 -0400 Received: by mail-pg0-f47.google.com with SMTP id 132so19045255pgb.2 for ; Fri, 23 Jun 2017 02:25:41 -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=59i8DlrNUCQuB2Lu4XwaZTjkgSkNa/rp8M1nIfMjGE8=; b=YBvZLkXmWW7wwAP+X8/gXdhodM4pwYLcALaELkelgP2AdN8j0TZFANvqjLAYy9BLNx P2fXK0PoC1ifggMqY2xf0OYAc6nvPNlI6u1hEzF4NxVpUUFaClFuZS/6uWIFAqDKAMmf dsuOhSenz1kj2TfEswMW8T7hB6GEp/a3K8gi8= 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=59i8DlrNUCQuB2Lu4XwaZTjkgSkNa/rp8M1nIfMjGE8=; b=YaujQoefT2lH/UU4v98XbxIK1dt8ghKYRkZmvrC8/+GqWiFweVFkRPCtW0BDyqM9SF OZmmJUU3vrLXueWxWuWNipfcsHeEgWFK4Je3G4xwD3Rx5eSaVEW4ycb7VhRWkZHQMWRU Xe6ivY+fecdUxUyDOUCJgZSmEPGVHriFSSs2N1hFQnVn3K0TkJes1poRaYUATiZYCryf rUvoA7ZpDsJrxM/kObTYPJL68WdpqvTVRZu5D0Xz0ltYSRsiZAQngUsfhWXhGOuAk7JD 65nV84lXWDbKrujzyqoEVZa+i5dY6RBgZSg3RLrWRfsE8endeGu/238xhj9fkT1o3cEK O3wQ== X-Gm-Message-State: AKS2vOxK18DlZN6xyGPKY1HHzlZ99BmI8rJrFUo6bRcLyC7mrKzmRKFU HOQdix6CrKIWwz7r X-Received: by 10.99.131.193 with SMTP id h184mr7271514pge.80.1498209941061; Fri, 23 Jun 2017 02:25:41 -0700 (PDT) Received: from localhost ([122.172.59.234]) by smtp.gmail.com with ESMTPSA id r69sm9055406pfg.28.2017.06.23.02.25.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Jun 2017 02:25:40 -0700 (PDT) From: Viresh Kumar To: Juri Lelli , Greg Kroah-Hartman Cc: Viresh Kumar , linux-arm-kernel@lists.infradead.org, Catalin Marinas , linux@arm.linux.org.uk, Will Deacon , Vincent Guittot , arnd.bergmann@linaro.org, linux-kernel@vger.kernel.org Subject: [PATCH V3 1/5] arch_topology: Don't break lines unnecessarily Date: Fri, 23 Jun 2017 14:55:30 +0530 Message-Id: X-Mailer: git-send-email 2.13.0.71.gd7076ec9c9cb 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 no need of line break at few places, avoid them. Signed-off-by: Viresh Kumar --- drivers/base/arch_topology.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) -- 2.13.0.71.gd7076ec9c9cb diff --git a/drivers/base/arch_topology.c b/drivers/base/arch_topology.c index d1c33a85059e..0ad79b5cd56d 100644 --- a/drivers/base/arch_topology.c +++ b/drivers/base/arch_topology.c @@ -41,8 +41,7 @@ static ssize_t cpu_capacity_show(struct device *dev, { struct cpu *cpu = container_of(dev, struct cpu, dev); - return sprintf(buf, "%lu\n", - topology_get_cpu_scale(NULL, cpu->dev.id)); + return sprintf(buf, "%lu\n", topology_get_cpu_scale(NULL, cpu->dev.id)); } static ssize_t cpu_capacity_store(struct device *dev, @@ -128,8 +127,7 @@ int __init topology_parse_cpu_capacity(struct device_node *cpu_node, int cpu) if (cap_parsing_failed) return !ret; - ret = of_property_read_u32(cpu_node, - "capacity-dmips-mhz", + ret = of_property_read_u32(cpu_node, "capacity-dmips-mhz", &cpu_capacity); if (!ret) { if (!raw_capacity) { @@ -181,8 +179,7 @@ init_cpu_capacity_callback(struct notifier_block *nb, pr_debug("cpu_capacity: init cpu capacity for CPUs [%*pbl] (to_visit=%*pbl)\n", cpumask_pr_args(policy->related_cpus), cpumask_pr_args(cpus_to_visit)); - cpumask_andnot(cpus_to_visit, - cpus_to_visit, + cpumask_andnot(cpus_to_visit, cpus_to_visit, policy->related_cpus); for_each_cpu(cpu, policy->related_cpus) { raw_capacity[cpu] = topology_get_cpu_scale(NULL, cpu) * From patchwork Fri Jun 23 09:25:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 106252 Delivered-To: patch@linaro.org Received: by 10.140.91.2 with SMTP id y2csp112355qgd; Fri, 23 Jun 2017 02:26:20 -0700 (PDT) X-Received: by 10.98.13.219 with SMTP id 88mr7232278pfn.191.1498209980033; Fri, 23 Jun 2017 02:26:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498209980; cv=none; d=google.com; s=arc-20160816; b=NqGOPA735Q0IgXgnyJ2iGSq+/CoZAWxdInvTjCqWW3q99cpHsL1vYwaUYw7jVwJ8HN TYP31/WkXqLBxtL7RRFz8GW0lxJPDoWAgl2TaMZdbYKdAnojfkzDDMOjs867dRss50mG A+FCi/W7wDxoCvCAU09igq8CyHmWkFgby85B99BGm/6hbunYUDaS6lCCOPnpYzw9VOt0 +DrnaJrOJrPYbsGBXk/gctc5mt6nke9sicSQYzFPVbYypcLzm2ZWKPn0YagOS+m2wjXC GVzXw717EBXo6WsdvPZkZ85kvUJs22AHgaBmp4eGRS9NpH90zTdkYr/X+cpaE1/5KzcN BtCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=N5WU1w8GXcrMAE9Bpj1YpWWO/ng0eDCB/EfYstgg0Ic=; b=yna0qrkqZHjy8sT52TXbszHtSQ6quOLZv00wHgMKFIPWqdzm0hm6MSIcU+IGCZaYnT fNpU5UB+hrivhBm37fPeN7tLW8lGKdrdKZ/OpPgSi2yKfkpOaAdxc0E5x3IFrdbbYftQ YPYDzrLT7W6bV8Wdm6pkRZ9iklyhNud6Pf6WYR9GeSBV4MWcti/LnEzdygCe1Pd5EacY nWfN243SlpeQyO1e2NDO+bgYmXxL/aIYT5h1UVfCFzt75a7QeghJgpKIAeE8uU0BjJAX aBRtA6h+bp+czH5qUG2tGdfkAXomu6r7GzC1whCDXUXFCeD3Khtzx7EM1jYInVXazPp7 QhRQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.b=VpbnD50L; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t18si2984519pge.491.2017.06.23.02.26.19; Fri, 23 Jun 2017 02:26:20 -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 header.b=VpbnD50L; 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 S1754696AbdFWJZ4 (ORCPT + 25 others); Fri, 23 Jun 2017 05:25:56 -0400 Received: from mail-pg0-f48.google.com ([74.125.83.48]:33060 "EHLO mail-pg0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754617AbdFWJZo (ORCPT ); Fri, 23 Jun 2017 05:25:44 -0400 Received: by mail-pg0-f48.google.com with SMTP id f127so19037673pgc.0 for ; Fri, 23 Jun 2017 02:25:44 -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=N5WU1w8GXcrMAE9Bpj1YpWWO/ng0eDCB/EfYstgg0Ic=; b=VpbnD50L7T2nek2uJRWvVI5Jju41aQfHa4pic+jFhIXRM6/EYHpmBvhyQqC2UFdVSI HPl1IgAQufJIlIGIcydypEtOYt4rbpXjTeQYNG9yM1yR2L8e46psmD31oUMOFWbC5rrE 0DvAL/Ne1cnUkDzUQ2bS6javCHJWZti9D+unQ= 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=N5WU1w8GXcrMAE9Bpj1YpWWO/ng0eDCB/EfYstgg0Ic=; b=Kv1HB5LoqOTQKtbKhX7T1Y9xhvQ5HeSiYBVtW6Zzlpwg5LU4xUmV6sU1XRyyHs01mw qgZiLbxzDNTJaYJwF8DNEduVqjaaYltJVabf9g0di1b7kAffrGeS7Zq1OJCUA+BSCcvt xawg8fZBiEQ2IdT0a/yupA6ZteGRnr1LX87O/ZD0Lo5gWK+nIyOHidZSmdGiQgzHztBQ ojrwQFBEXajTPvlwFBy8DGDDCFl2KIpP/R8ZMTiOoOx2+z+c6xZvry0nP2iJnrclN9dd HKDXSKDKU18s03CVFFsR48eEWeOqBpGrkAqR8b3z7+aUhqLRbBMlo4guF2pORk7JVcyQ DdjQ== X-Gm-Message-State: AKS2vOxXBv6nfYw+rK8XrCZ20QTqZHTbPkfkMUtprOhIRbEKEA1u3wNf NNmP3VD7wMOnFywU X-Received: by 10.84.132.42 with SMTP id 39mr7809559ple.226.1498209943934; Fri, 23 Jun 2017 02:25:43 -0700 (PDT) Received: from localhost ([122.172.59.234]) by smtp.gmail.com with ESMTPSA id u2sm9616108pgn.28.2017.06.23.02.25.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Jun 2017 02:25:43 -0700 (PDT) From: Viresh Kumar To: Juri Lelli , Greg Kroah-Hartman Cc: Viresh Kumar , linux-arm-kernel@lists.infradead.org, Catalin Marinas , linux@arm.linux.org.uk, Will Deacon , Vincent Guittot , arnd.bergmann@linaro.org, linux-kernel@vger.kernel.org Subject: [PATCH V3 2/5] arch_topology: Convert switch block to if block Date: Fri, 23 Jun 2017 14:55:31 +0530 Message-Id: <7b5f25af1e0f1365ec6b3996cc31848f529322cd.1498209817.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 2.13.0.71.gd7076ec9c9cb 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 We only need to take care of one case here (CPUFREQ_NOTIFY) and there is no need to add an extra level of indentation to the case specific code by using a switch block. Use an if block instead. Also add some blank lines to make the code look better. Signed-off-by: Viresh Kumar --- drivers/base/arch_topology.c | 41 ++++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-) -- 2.13.0.71.gd7076ec9c9cb diff --git a/drivers/base/arch_topology.c b/drivers/base/arch_topology.c index 0ad79b5cd56d..a3cd7c869c3e 100644 --- a/drivers/base/arch_topology.c +++ b/drivers/base/arch_topology.c @@ -174,26 +174,29 @@ init_cpu_capacity_callback(struct notifier_block *nb, if (cap_parsing_failed || cap_parsing_done) return 0; - switch (val) { - case CPUFREQ_NOTIFY: - pr_debug("cpu_capacity: init cpu capacity for CPUs [%*pbl] (to_visit=%*pbl)\n", - cpumask_pr_args(policy->related_cpus), - cpumask_pr_args(cpus_to_visit)); - cpumask_andnot(cpus_to_visit, cpus_to_visit, - policy->related_cpus); - for_each_cpu(cpu, policy->related_cpus) { - raw_capacity[cpu] = topology_get_cpu_scale(NULL, cpu) * - policy->cpuinfo.max_freq / 1000UL; - capacity_scale = max(raw_capacity[cpu], capacity_scale); - } - if (cpumask_empty(cpus_to_visit)) { - topology_normalize_cpu_scale(); - kfree(raw_capacity); - pr_debug("cpu_capacity: parsing done\n"); - cap_parsing_done = true; - schedule_work(&parsing_done_work); - } + if (val != CPUFREQ_NOTIFY) + return 0; + + pr_debug("cpu_capacity: init cpu capacity for CPUs [%*pbl] (to_visit=%*pbl)\n", + cpumask_pr_args(policy->related_cpus), + cpumask_pr_args(cpus_to_visit)); + + cpumask_andnot(cpus_to_visit, cpus_to_visit, policy->related_cpus); + + for_each_cpu(cpu, policy->related_cpus) { + raw_capacity[cpu] = topology_get_cpu_scale(NULL, cpu) * + policy->cpuinfo.max_freq / 1000UL; + capacity_scale = max(raw_capacity[cpu], capacity_scale); } + + if (cpumask_empty(cpus_to_visit)) { + topology_normalize_cpu_scale(); + kfree(raw_capacity); + pr_debug("cpu_capacity: parsing done\n"); + cap_parsing_done = true; + schedule_work(&parsing_done_work); + } + return 0; } From patchwork Fri Jun 23 09:25:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 106251 Delivered-To: patch@linaro.org Received: by 10.140.91.2 with SMTP id y2csp112353qgd; Fri, 23 Jun 2017 02:26:19 -0700 (PDT) X-Received: by 10.99.109.201 with SMTP id i192mr6999752pgc.204.1498209979668; Fri, 23 Jun 2017 02:26:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498209979; cv=none; d=google.com; s=arc-20160816; b=qOohdofnb6iQYBM6p18ljNtSO14Ir1grdDr277L39I/Lq44O9QWECrnuaGsQ/anNIE zExzLg4cEfn8tQkV/ySkfAJvqNhXd0eqdYkTLDVNTUAWeGUpRZUcxvhigqZQzcghytVr wVFeAWnC/ql+Jakm1Wy3pK1/Z2oMxBdE7Ph4OiBc7JVFncZGe9RwTQ88RiyZqnXKJ2Ia 5a93kBSiXk3aladKRp48eokv5S8ouNc73QbPGFRySRzcM92OHdrQ21OEtuqH8PGLBXNg 6BYVbBJclOCfwBnb58gFEnrdSLyzqU05nUpTOWtR43tQZZud7Yq+idO3sHti9hojPhia VFdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=lihHQjANG7Q9kkJpE2pXSMRZHZddthkCihNLD7YXaYc=; b=Up986VKhdWyYpa5+N9xUVn7tkZkaN+p7OaNhLKStWg8i4UyuxGA52T2zzPvqn+FJuy qFx9SVw9KGmjP9Pb5ypgTniwlE08rM+HRXXN9yQIuMgo6FsT6cdP821se74nIIyRXQ3M 66uVVSQv+53I0+y0f6j6dtdwbkhXi//+chyM7p0kOs5MyP0HsKB98/CPOsWKTvNR3H21 KYdZIPih35qWRQ1mLIz5QMPWqbDpfvhGPZF30j39oNsS5qOc73ueYKft9MJ/MsDoXUPs iThJA+B619YMKi8FkHMKPA8EQweo7wJiFs1m9nUx8VFnHvJu1CuBQ0g4CfELeDKHRBGf NSjQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.b=aPcRIzD2; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t18si2984519pge.491.2017.06.23.02.26.19; Fri, 23 Jun 2017 02:26:19 -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 header.b=aPcRIzD2; 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 S1754684AbdFWJZy (ORCPT + 25 others); Fri, 23 Jun 2017 05:25:54 -0400 Received: from mail-pg0-f52.google.com ([74.125.83.52]:36682 "EHLO mail-pg0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753694AbdFWJZr (ORCPT ); Fri, 23 Jun 2017 05:25:47 -0400 Received: by mail-pg0-f52.google.com with SMTP id u62so19024650pgb.3 for ; Fri, 23 Jun 2017 02:25: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=lihHQjANG7Q9kkJpE2pXSMRZHZddthkCihNLD7YXaYc=; b=aPcRIzD2BU24D5yfW8Y46h+uqz/6QPkkNL5RlW4g2kaS/DJVxdVCRQEBYe5308c+wO 3zRdxyAO+O5cJrxfu9wY2Jue8+JSCNzjViCRTuH5ii54hE6Q8SvyzcHkeD3+Dc8qEKQZ oJ0l6Z2WtDP6nyuQdzqM6fJ+b3Ij7zcXSOZqQ= 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=lihHQjANG7Q9kkJpE2pXSMRZHZddthkCihNLD7YXaYc=; b=tTl2yZbYuKkyTy0qzWsn6BIvsD38CdhLEjWLwdD9vPlPOaV2JqLNI4ck4VaUmC5X7m os6mvGio8ndrZm2ZL0LvbClJ0SYoVVJ5qPh/R9Pg0WVREoLPmDnLPOz1WRzSYJ76eosf D2BDSiQpVoAuuX5W1ViXWdfbllwHqOOUVKTBTEs0PZOjfAOYdxy150xtQ6WPNGytG1G8 1OeGkQxqw2Hx1EfPO5YAv+J6IbGvpjyvLvTRz5eaQbTZhSdKdzopWicIETbrVB39oz/z WGtFoyBYP3GhJH2zbaSdDzRuBiQ3Al3IWvMtDVJmg1NduSXN6rnpoP9pecaAYVWBWM7H F+hA== X-Gm-Message-State: AKS2vOyq3SJK0g9z/ZqBqho6mnQvyx3yU0ZY0qPXVtSJt2u7rRf1FuRY Znjw+u8T/ZoNdH6N X-Received: by 10.84.150.164 with SMTP id h33mr8128856plh.152.1498209946808; Fri, 23 Jun 2017 02:25:46 -0700 (PDT) Received: from localhost ([122.172.59.234]) by smtp.gmail.com with ESMTPSA id 24sm8993776pfs.58.2017.06.23.02.25.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Jun 2017 02:25:46 -0700 (PDT) From: Viresh Kumar To: Juri Lelli , Greg Kroah-Hartman Cc: Viresh Kumar , linux-arm-kernel@lists.infradead.org, Catalin Marinas , linux@arm.linux.org.uk, Will Deacon , Vincent Guittot , arnd.bergmann@linaro.org, linux-kernel@vger.kernel.org Subject: [PATCH V3 3/5] arch_topology: Change return type of topology_parse_cpu_capacity() to bool Date: Fri, 23 Jun 2017 14:55:32 +0530 Message-Id: <23788541e21b137b0f868f9da3ab1c4db028debc.1498209817.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 2.13.0.71.gd7076ec9c9cb 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 topology_parse_cpu_capacity() returns 1 on success and 0 on errors. Make it return bool instead of int as that suits the purpose better. Signed-off-by: Viresh Kumar --- drivers/base/arch_topology.c | 8 ++++---- include/linux/arch_topology.h | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) -- 2.13.0.71.gd7076ec9c9cb diff --git a/drivers/base/arch_topology.c b/drivers/base/arch_topology.c index a3cd7c869c3e..5728e2fbb765 100644 --- a/drivers/base/arch_topology.c +++ b/drivers/base/arch_topology.c @@ -119,13 +119,13 @@ void topology_normalize_cpu_scale(void) mutex_unlock(&cpu_scale_mutex); } -int __init topology_parse_cpu_capacity(struct device_node *cpu_node, int cpu) +bool __init topology_parse_cpu_capacity(struct device_node *cpu_node, int cpu) { - int ret = 1; + int ret; u32 cpu_capacity; if (cap_parsing_failed) - return !ret; + return false; ret = of_property_read_u32(cpu_node, "capacity-dmips-mhz", &cpu_capacity); @@ -137,7 +137,7 @@ int __init topology_parse_cpu_capacity(struct device_node *cpu_node, int cpu) if (!raw_capacity) { pr_err("cpu_capacity: failed to allocate memory for raw capacities\n"); cap_parsing_failed = true; - return 0; + return false; } } capacity_scale = max(cpu_capacity, capacity_scale); diff --git a/include/linux/arch_topology.h b/include/linux/arch_topology.h index 9af3c174c03a..716ce587247e 100644 --- a/include/linux/arch_topology.h +++ b/include/linux/arch_topology.h @@ -4,10 +4,12 @@ #ifndef _LINUX_ARCH_TOPOLOGY_H_ #define _LINUX_ARCH_TOPOLOGY_H_ +#include + void topology_normalize_cpu_scale(void); struct device_node; -int topology_parse_cpu_capacity(struct device_node *cpu_node, int cpu); +bool topology_parse_cpu_capacity(struct device_node *cpu_node, int cpu); struct sched_domain; unsigned long topology_get_cpu_scale(struct sched_domain *sd, int cpu); From patchwork Fri Jun 23 09:25:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 106250 Delivered-To: patch@linaro.org Received: by 10.140.91.2 with SMTP id y2csp112351qgd; Fri, 23 Jun 2017 02:26:19 -0700 (PDT) X-Received: by 10.84.136.129 with SMTP id 1mr7843903pll.213.1498209979313; Fri, 23 Jun 2017 02:26:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498209979; cv=none; d=google.com; s=arc-20160816; b=Ol3+eb0clH1mk2hQ9s5CaIgfuCGDDypw66m6DA3f4amzs9ljfRRC6svSVSTEEs4lwt IgR76rD7A6rwK1UklxbAfKabSvmk9bHd8LwTkmUc5Ij896bYLw+cesrsQVBdZZkEvTjH NxfvshUFSpknvCvbu1RFwsn0y+TWhLXB/VobmJXKgEfgLUO/t6xLc6HL6+dUpzMdz6iu S0Yr/soZjYh0x62Hzc4eyezjUcp/oA7XfMTW1UA0PvJdPafw8WmKJbWUjQaGlX7qBEIg g/sh0vjv+LhdIGwTHvxEKw6X/JLU1xyRHLna/YUQDKRQQ8X1HcG9FsjxYdMUDV6ZjyFD jxYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=8hTt9qoVuLZvprh667SfMZB0mqtWyBGI6UY7vV4wwI8=; b=wqoLP7232qKDDWQebdvo5j+4RDnGcEUv/RRL+hvziTIbQH8UOUlvZQ8V7Ue0sJEWef SDZ0UbLhEBgwcSp30bIhCYp1MeIQMa6KtN/vUTa44I7BF3U9qFxBFP7efwvy0e2FnhmH i4fUosGnWkm54yOR7qJ8SgaRqf/Ve3hmaKdLZGI0lSFAUvsRlFOZxl5nu58Fw12IckJU nd4XIuEX/wjFNRXkvXMCaqw2ZuaLg9bfcWq6L17zvS75qy+uY+DYQ5S0LrIv32YiMHZ0 U74EESdOEVOw121WLeepP4UCGLFwE8CXDc9/D/GdTqrnwvttzRFbCPGOY17WvrLZYaP3 USpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.b=QE0zu0FQ; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t18si2984519pge.491.2017.06.23.02.26.19; Fri, 23 Jun 2017 02:26:19 -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 header.b=QE0zu0FQ; 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 S1754662AbdFWJZx (ORCPT + 25 others); Fri, 23 Jun 2017 05:25:53 -0400 Received: from mail-pg0-f48.google.com ([74.125.83.48]:33074 "EHLO mail-pg0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754161AbdFWJZu (ORCPT ); Fri, 23 Jun 2017 05:25:50 -0400 Received: by mail-pg0-f48.google.com with SMTP id f127so19038101pgc.0 for ; Fri, 23 Jun 2017 02:25:50 -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=8hTt9qoVuLZvprh667SfMZB0mqtWyBGI6UY7vV4wwI8=; b=QE0zu0FQaLwh3dSk5xOUHKF/L2do42B8F/rvJl/J4c/nw1uFzmgxKB6+w8RiegRkZZ PlCoxNIQvyvOqQ0C6FJ7s8egCsG7sUKiFzWL6cbHV47OEdf2EVDcoA5OoOWVEFsCfLbN saSlzUmVPO+4u1IiARwXfGUf6/gFIJejDVMjk= 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=8hTt9qoVuLZvprh667SfMZB0mqtWyBGI6UY7vV4wwI8=; b=VrFWiixJL7eWGSVFsqAhcyBXJUDYV5iZ+c+Ud8Am55KZugRejWq/eJV/SRDmMLoizT P+a8jXnze5HorV9LFEtFbY0pEkzt4Fxa6iGicXo5ACKNF238LbcSaA9QsbJgykcEEp9w GFzkKOe24KISoy0rGrHHikXNie4Ym08ZJf5gIwugLmldRxQlCUr2Qg7F4LMlK6V+OtrP UCA5NUVmE4XFIyXyzlpSZReR2KGAiiVmmnCyCLcu4epBQDAQdWgelcEb/BAhX92G94Uy MdjIhrq3QigDZniNnzSDdX8I3XzUucMC+Y1YpPuzYstPGE7W/6RPXgHY58W7bc/2Q9Hk sYCg== X-Gm-Message-State: AKS2vOxJitS3QGycoAIo2CTAVp6j++ZrafQs5zp03n2SKicrXGfnVaZe +ET/8lATwXlLOmW3 X-Received: by 10.98.80.139 with SMTP id g11mr7334039pfj.146.1498209949706; Fri, 23 Jun 2017 02:25:49 -0700 (PDT) Received: from localhost ([122.172.59.234]) by smtp.gmail.com with ESMTPSA id 5sm8102267pfe.60.2017.06.23.02.25.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Jun 2017 02:25:49 -0700 (PDT) From: Viresh Kumar To: Juri Lelli , Greg Kroah-Hartman Cc: Viresh Kumar , linux-arm-kernel@lists.infradead.org, Catalin Marinas , linux@arm.linux.org.uk, Will Deacon , Vincent Guittot , arnd.bergmann@linaro.org, linux-kernel@vger.kernel.org Subject: [PATCH V3 4/5] arch_topology: Localize cap_parsing_failed to topology_parse_cpu_capacity() Date: Fri, 23 Jun 2017 14:55:33 +0530 Message-Id: <12320387190373d6574a4cf618809ed60dd5b9be.1498209817.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 2.13.0.71.gd7076ec9c9cb 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 cap_parsing_failed is only required in topology_parse_cpu_capacity() to know if we have already tried to allocate raw_capacity and failed, or if at least one of the cpu_node didn't had the required "capacity-dmips-mhz" property. All other users can use raw_capacity instead of cap_parsing_failed. Make sure we set raw_capacity to NULL after we free it. Signed-off-by: Viresh Kumar --- drivers/base/arch_topology.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) -- 2.13.0.71.gd7076ec9c9cb diff --git a/drivers/base/arch_topology.c b/drivers/base/arch_topology.c index 5728e2fbb765..9e4d2107f4fa 100644 --- a/drivers/base/arch_topology.c +++ b/drivers/base/arch_topology.c @@ -95,14 +95,21 @@ subsys_initcall(register_cpu_capacity_sysctl); static u32 capacity_scale; static u32 *raw_capacity; -static bool cap_parsing_failed; + +static int __init free_raw_capacity(void) +{ + kfree(raw_capacity); + raw_capacity = NULL; + + return 0; +} void topology_normalize_cpu_scale(void) { u64 capacity; int cpu; - if (!raw_capacity || cap_parsing_failed) + if (!raw_capacity) return; pr_debug("cpu_capacity: capacity_scale=%u\n", capacity_scale); @@ -121,6 +128,7 @@ void topology_normalize_cpu_scale(void) bool __init topology_parse_cpu_capacity(struct device_node *cpu_node, int cpu) { + static bool cap_parsing_failed; int ret; u32 cpu_capacity; @@ -151,7 +159,7 @@ bool __init topology_parse_cpu_capacity(struct device_node *cpu_node, int cpu) pr_err("cpu_capacity: partial information: fallback to 1024 for all CPUs\n"); } cap_parsing_failed = true; - kfree(raw_capacity); + free_raw_capacity(); } return !ret; @@ -171,7 +179,7 @@ init_cpu_capacity_callback(struct notifier_block *nb, struct cpufreq_policy *policy = data; int cpu; - if (cap_parsing_failed || cap_parsing_done) + if (!raw_capacity || cap_parsing_done) return 0; if (val != CPUFREQ_NOTIFY) @@ -191,7 +199,7 @@ init_cpu_capacity_callback(struct notifier_block *nb, if (cpumask_empty(cpus_to_visit)) { topology_normalize_cpu_scale(); - kfree(raw_capacity); + free_raw_capacity(); pr_debug("cpu_capacity: parsing done\n"); cap_parsing_done = true; schedule_work(&parsing_done_work); @@ -233,11 +241,5 @@ static void parsing_done_workfn(struct work_struct *work) } #else -static int __init free_raw_capacity(void) -{ - kfree(raw_capacity); - - return 0; -} core_initcall(free_raw_capacity); #endif From patchwork Fri Jun 23 09:25:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 106253 Delivered-To: patch@linaro.org Received: by 10.140.91.2 with SMTP id y2csp112404qgd; Fri, 23 Jun 2017 02:26:31 -0700 (PDT) X-Received: by 10.84.129.111 with SMTP id 102mr7968500plb.221.1498209990914; Fri, 23 Jun 2017 02:26:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498209990; cv=none; d=google.com; s=arc-20160816; b=gsnCXrfbHNvLU2a2vq3AR1hY2OzovJS1+qjAAwb/wYf56BjbisDaKRZpuir+YNhNPR AJXNLeGnaCglFbVXZIpkOIscTTcpDh3R+1UyAUPnyZM7AeymAPmeUZrJYVUs8bf5AHVc 3+60it4mgmIc6Me7oTb0042WJoANSe9jdbdrYncffOsRBVgNlacdQL6758+buFgfjxtp BjdIQxONDs5XCROK4hhTXhTtUTK6UVALxWC4dORCKupNy8arTQ9kzhjh7ylJekH/Qr4t F0gQvxujnDuaNqYeF8g+rMRsHw1SLC8GQD208EpSywdnbhiq782UCfEenTp1JSJILnal 1TXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=PW+JDHmKoS/izDPbYhbU5PamP8piCq6nzEVQjDX1PB4=; b=vOzeF4qa5cxxTKl6AWp7TMGRRR6MQJy70UccVtzSKroJ3LiVybVGF5GZqRGzjVRnBC TLB+Pg0+AqNW6VpOCx5mMNIsRwJMRAEB0w/o6XNzCfVvj4Q5VmIJgkAPgxblD2GZ83MS 4eRZ+NdOdXku2CvRv4WM85DjbKbwY9Gg5V8wTTZJmn0snuHZyWBb/cpQh9JvHYQ0LBAh pPpa8UdkPwzqYzmikq8vGnE79MxrKRJVV2/kDESKjTPteMBgtE7YpzKwG4mt3ZkUUTui ocXT6EreSpXgQtDumMNMATM+FNRMdwmda9v49XLCpLmtG3NP3nuMRMXC4x3+i7LXHLV5 0uqw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.b=VtZ8uQNz; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t18si2984519pge.491.2017.06.23.02.26.30; Fri, 23 Jun 2017 02:26:30 -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 header.b=VtZ8uQNz; 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 S1754713AbdFWJ0A (ORCPT + 25 others); Fri, 23 Jun 2017 05:26:00 -0400 Received: from mail-pf0-f179.google.com ([209.85.192.179]:35736 "EHLO mail-pf0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754697AbdFWJZ6 (ORCPT ); Fri, 23 Jun 2017 05:25:58 -0400 Received: by mail-pf0-f179.google.com with SMTP id c73so21079688pfk.2 for ; Fri, 23 Jun 2017 02:25:53 -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=PW+JDHmKoS/izDPbYhbU5PamP8piCq6nzEVQjDX1PB4=; b=VtZ8uQNzsRYsntag0SEH+tGHIPdmOkVIQKcSvvi0yrc/REKGqifK0PZijJ19L12iXU vBppLXXI0tqjYwrB4xCIREmuxExcgsAFf8rcXgZ6jFbRQdiLqHLWuKLt7MU1oEWk3a+k XXmu7l+NnheJ4pWpGQSEeA+moS2cBxyAAey0g= 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=PW+JDHmKoS/izDPbYhbU5PamP8piCq6nzEVQjDX1PB4=; b=V1pSNeCBzugwsB4ynJovom+uPchsPgZY9JrXzp+DZtfrMGK1+eC5SfoIayXrF7a+FJ qHi2VKrO+spd4THQU69y49T4Pf5XOkq04sktD9kTqbmnAKAO/cptSlVC4eSRU/+xL95t rkHp4pq4ckjGXYkt5iWOmqhGRUzNW9g8Q0HqOmN9InIiX44CwmK1+BzbGIpRTa+I4pBL Vn9KqKMV0EbK4sMox+S1kIOJYRMvlss1aOoNlpMID+Ou3lxq+MiukKH4EVpMH8vfK1rM 3hKqXcqOkgOyr2/nebwMNGQ1ZacBDtgDY4Me91HFhtDbyoLTAzzkEXyxyy8qbM1h1JGw La5w== X-Gm-Message-State: AKS2vOxoYAhAIAIAIvQ5NHqwlSk06L1eyzYf8uvPeP8vQQJabuyI8KTE 7PmoRyhP/s4sV+cA X-Received: by 10.84.132.73 with SMTP id 67mr7800757ple.53.1498209952585; Fri, 23 Jun 2017 02:25:52 -0700 (PDT) Received: from localhost ([122.172.59.234]) by smtp.gmail.com with ESMTPSA id w190sm10693406pgb.30.2017.06.23.02.25.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Jun 2017 02:25:52 -0700 (PDT) From: Viresh Kumar To: Juri Lelli , Greg Kroah-Hartman Cc: Viresh Kumar , linux-arm-kernel@lists.infradead.org, Catalin Marinas , linux@arm.linux.org.uk, Will Deacon , Vincent Guittot , arnd.bergmann@linaro.org, linux-kernel@vger.kernel.org Subject: [PATCH V3 5/5] arch_topology: Get rid of cap_parsing_done Date: Fri, 23 Jun 2017 14:55:34 +0530 Message-Id: <7199675116c3b27cec234b8bd50d94e88b26032a.1498209817.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 2.13.0.71.gd7076ec9c9cb 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 no need to check for cap_parsing_done flag anymore as !raw_capacity flag alone is enough for us. Remove the (now) useless flag cap_parsing_done. Signed-off-by: Viresh Kumar --- drivers/base/arch_topology.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- 2.13.0.71.gd7076ec9c9cb diff --git a/drivers/base/arch_topology.c b/drivers/base/arch_topology.c index 9e4d2107f4fa..74043ead9da1 100644 --- a/drivers/base/arch_topology.c +++ b/drivers/base/arch_topology.c @@ -167,7 +167,6 @@ bool __init topology_parse_cpu_capacity(struct device_node *cpu_node, int cpu) #ifdef CONFIG_CPU_FREQ static cpumask_var_t cpus_to_visit; -static bool cap_parsing_done; static void parsing_done_workfn(struct work_struct *work); static DECLARE_WORK(parsing_done_work, parsing_done_workfn); @@ -179,7 +178,7 @@ init_cpu_capacity_callback(struct notifier_block *nb, struct cpufreq_policy *policy = data; int cpu; - if (!raw_capacity || cap_parsing_done) + if (!raw_capacity) return 0; if (val != CPUFREQ_NOTIFY) @@ -201,7 +200,6 @@ init_cpu_capacity_callback(struct notifier_block *nb, topology_normalize_cpu_scale(); free_raw_capacity(); pr_debug("cpu_capacity: parsing done\n"); - cap_parsing_done = true; schedule_work(&parsing_done_work); }