From patchwork Fri Oct 16 07:11:12 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 7411241 X-Patchwork-Delegate: rjw@sisk.pl Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 884FA9F36A for ; Fri, 16 Oct 2015 07:11:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9710E20838 for ; Fri, 16 Oct 2015 07:11:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 94C8820810 for ; Fri, 16 Oct 2015 07:11:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752495AbbJPHLm (ORCPT ); Fri, 16 Oct 2015 03:11:42 -0400 Received: from mail-pa0-f42.google.com ([209.85.220.42]:33158 "EHLO mail-pa0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752370AbbJPHLl (ORCPT ); Fri, 16 Oct 2015 03:11:41 -0400 Received: by pabrc13 with SMTP id rc13so112320302pab.0 for ; Fri, 16 Oct 2015 00:11:41 -0700 (PDT) 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; bh=lqWfFlY9hiH7TwlpxJRWQLXxh7bu+bkBPWR9ifkWDYc=; b=jY6BwWTG32a5hceNP7SiCvLwx7MBUqBcuethZnrIYZwrGska8vPDXLlmUa8o0nbmmc TXyqzlh+2xf4pNycb9YPF5YZOsUzG6X+LtYbF/EYMrd9w9yzHX+W2cwePQaDSG2vz0Ba 3fJtsGvSsLNsASTiOm8xBm8teWT8ZKW7WVwgLCzsl/3EL3r0NBKyvM1t5jxGb7GPwqu+ nm58ci6o5L/1ClYGx0LgTsveT58NgYUb22YfSlQxo24QGBU3F2u6jFp88LSfe/43PUp1 eORWbouLl8o38bNHTOSgFK+EWEn9wbZWstIlxJ8QAV0jqZra8G8kzdiqgyA66vI6Pox9 K9aA== X-Gm-Message-State: ALoCoQmpLcn1zipUqz0ISwnKUeMnKGreVnF3IzLepbgQwuySXrZ456Vl7mRUKGkVdQLR1TSRNMnQ X-Received: by 10.68.185.132 with SMTP id fc4mr14655528pbc.96.1444979501402; Fri, 16 Oct 2015 00:11:41 -0700 (PDT) Received: from localhost ([223.227.62.197]) by smtp.gmail.com with ESMTPSA id an5sm6963602pbd.45.2015.10.16.00.11.39 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 16 Oct 2015 00:11:40 -0700 (PDT) From: Viresh Kumar To: Rafael Wysocki Cc: linaro-kernel@lists.linaro.org, linux-pm@vger.kernel.org, skannan@codeaurora.org, Viresh Kumar , linux-kernel@vger.kernel.org (open list) Subject: [PATCH V3 5/5] cpufreq: postfix policy directory with the first CPU in related_cpus Date: Fri, 16 Oct 2015 12:41:12 +0530 Message-Id: <44a5b86d1df41812461630e5a7c5366d276e2855.1444979341.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 2.4.0 In-Reply-To: <20151016070842.GY19018@linux> References: <20151016070842.GY19018@linux> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The sysfs policy directory is postfixed currently with the CPU number for which the policy was created, which isn't necessarily the first CPU in related_cpus mask. To make it more consistent and predictable, lets postfix the policy with the first cpu in related-cpus mask. Suggested-by: Saravana Kannan Signed-off-by: Viresh Kumar Reviewed-by: Saravana Kannan --- V2->V3: - Fix error path where we may try to put an uninitialized kobject. - Break kobject_init_and_add() to kobject_init() and kobject_add(). drivers/cpufreq/cpufreq.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index 4fa2215cc6ec..7c48e7316d91 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -1022,7 +1022,6 @@ static struct cpufreq_policy *cpufreq_policy_alloc(unsigned int cpu) { struct device *dev = get_cpu_device(cpu); struct cpufreq_policy *policy; - int ret; if (WARN_ON(!dev)) return NULL; @@ -1040,13 +1039,7 @@ static struct cpufreq_policy *cpufreq_policy_alloc(unsigned int cpu) if (!zalloc_cpumask_var(&policy->real_cpus, GFP_KERNEL)) goto err_free_rcpumask; - ret = kobject_init_and_add(&policy->kobj, &ktype_cpufreq, - cpufreq_global_kobject, "policy%u", cpu); - if (ret) { - pr_err("%s: failed to init policy->kobj: %d\n", __func__, ret); - goto err_free_real_cpus; - } - + kobject_init(&policy->kobj, &ktype_cpufreq); INIT_LIST_HEAD(&policy->policy_list); init_rwsem(&policy->rwsem); spin_lock_init(&policy->transition_lock); @@ -1057,8 +1050,6 @@ static struct cpufreq_policy *cpufreq_policy_alloc(unsigned int cpu) policy->cpu = cpu; return policy; -err_free_real_cpus: - free_cpumask_var(policy->real_cpus); err_free_rcpumask: free_cpumask_var(policy->related_cpus); err_free_cpumask: @@ -1163,6 +1154,16 @@ static int cpufreq_online(unsigned int cpu) cpumask_copy(policy->related_cpus, policy->cpus); /* Remember CPUs present at the policy creation time. */ cpumask_and(policy->real_cpus, policy->cpus, cpu_present_mask); + + /* Name and add the kobject */ + ret = kobject_add(&policy->kobj, cpufreq_global_kobject, + "policy%u", + cpumask_first(policy->related_cpus)); + if (ret) { + pr_err("%s: failed to add policy->kobj: %d\n", __func__, + ret); + goto out_exit_policy; + } } /*