From patchwork Thu Apr 21 08:58:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 66347 Delivered-To: patch@linaro.org Received: by 10.140.93.198 with SMTP id d64csp16996qge; Thu, 21 Apr 2016 01:59:50 -0700 (PDT) X-Received: by 10.66.65.133 with SMTP id x5mr19144372pas.108.1461229190240; Thu, 21 Apr 2016 01:59:50 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f22si2477904pfj.46.2016.04.21.01.59.49; Thu, 21 Apr 2016 01:59:50 -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 S1752225AbcDUI7c (ORCPT + 29 others); Thu, 21 Apr 2016 04:59:32 -0400 Received: from mail-pf0-f176.google.com ([209.85.192.176]:34500 "EHLO mail-pf0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752134AbcDUI72 (ORCPT ); Thu, 21 Apr 2016 04:59:28 -0400 Received: by mail-pf0-f176.google.com with SMTP id y69so11199657pfb.1 for ; Thu, 21 Apr 2016 01:59:27 -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=1nfnNJtuBZgYrFPC2L5pEQcGD0czLVMCtuzbXyhiFZY=; b=OVB8jzM8jAXuuc9s83uoRpN6izKdLm+qLJIFjyVkDhG91rp7c2XG+iHxfP5vhBsf/R nyQtoi7pQZCHYGERnFbb784dEz3noOR5xApRRmPeprXjqcfPc9gvQnwUZ1W+qpM/WH1C uJzm5h1P1gbgFcYai8mKr3n0nJki+y6n/sxx0= 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=1nfnNJtuBZgYrFPC2L5pEQcGD0czLVMCtuzbXyhiFZY=; b=bwXPMfFSEJvcgnMPHYVr1MODRS2STrZP0HkGh4zelLEjd+uRiiG0gectlCIQ+71fqH 2J2+1Sej3qBhEA/ya4EBT2bozWdabAN+cqLIY+DVVkwXrnAkw+YdrkAJpy+C8FzkqEM+ mqcRQH0lxfVjgqH+iiNSKEjAwh80+GipBXs/WCmm75lbGZ7Y7BZFqyA2/4J5jsZ5uH+C BXFr6/c516hrXJkozR8DEpBvFfdB3TnvanGBqDJ2qFHRCdYEy3aWBnSG2Ti2r73KVNuU Lz0nFyBauiVyT3OtKLzKJxVrBkLtej4xLRB8bNczzuGGY8sj1qkqH5U2OzbpjDNoUlaA d8zQ== X-Gm-Message-State: AOPr4FVOtXqBJd8C5aTT6uVKXMOm6EN7r7el/7Xn8UBX9cdjbyYD6v4eDSoUA+xhVIV3YWVC X-Received: by 10.98.49.71 with SMTP id x68mr18898526pfx.105.1461229167163; Thu, 21 Apr 2016 01:59:27 -0700 (PDT) Received: from localhost ([122.167.26.250]) by smtp.gmail.com with ESMTPSA id i67sm3079663pfb.56.2016.04.21.01.59.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Apr 2016 01:59:26 -0700 (PDT) From: Viresh Kumar To: Rafael Wysocki , Viresh Kumar , Nishanth Menon , Stephen Boyd Cc: linaro-kernel@lists.linaro.org, linux-pm@vger.kernel.org, arnd.bergmann@linaro.org, andrew@lunn.ch, gregory.clement@free-electrons.com, jason@lakedaemon.net, sebastian.hesselbarth@gmail.com, thomas.petazzoni@free-electrons.com, Viresh Kumar , linux-kernel@vger.kernel.org Subject: [PATCH 03/10] PM / OPP: dev_pm_opp_set_sharing_cpus() doesn't depend on CONFIG_OF Date: Thu, 21 Apr 2016 14:28:55 +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 dev_pm_opp_set_sharing_cpus() doesn't do any DT specific stuff and its declarations are added within the CONFIG_OF ifdef by mistake. Take them out of that. Signed-off-by: Viresh Kumar --- include/linux/pm_opp.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) -- 2.7.1.410.g6faf27b diff --git a/include/linux/pm_opp.h b/include/linux/pm_opp.h index cccaf4a29e9f..5b6ad31403a5 100644 --- a/include/linux/pm_opp.h +++ b/include/linux/pm_opp.h @@ -65,6 +65,7 @@ void dev_pm_opp_put_prop_name(struct device *dev); int dev_pm_opp_set_regulator(struct device *dev, const char *name); void dev_pm_opp_put_regulator(struct device *dev); int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq); +int dev_pm_opp_set_sharing_cpus(struct device *cpu_dev, cpumask_var_t cpumask); #else static inline unsigned long dev_pm_opp_get_voltage(struct dev_pm_opp *opp) { @@ -178,6 +179,11 @@ static inline int dev_pm_opp_set_rate(struct device *dev, unsigned long target_f return -EINVAL; } +static inline int dev_pm_opp_set_sharing_cpus(struct device *cpu_dev, cpumask_var_t cpumask) +{ + return -ENOSYS; +} + #endif /* CONFIG_PM_OPP */ #if defined(CONFIG_PM_OPP) && defined(CONFIG_OF) @@ -186,7 +192,6 @@ void dev_pm_opp_of_remove_table(struct device *dev); int dev_pm_opp_of_cpumask_add_table(cpumask_var_t cpumask); void dev_pm_opp_of_cpumask_remove_table(cpumask_var_t cpumask); int dev_pm_opp_of_get_sharing_cpus(struct device *cpu_dev, cpumask_var_t cpumask); -int dev_pm_opp_set_sharing_cpus(struct device *cpu_dev, cpumask_var_t cpumask); #else static inline int dev_pm_opp_of_add_table(struct device *dev) { @@ -210,11 +215,6 @@ static inline int dev_pm_opp_of_get_sharing_cpus(struct device *cpu_dev, cpumask { return -ENOSYS; } - -static inline int dev_pm_opp_set_sharing_cpus(struct device *cpu_dev, cpumask_var_t cpumask) -{ - return -ENOSYS; -} #endif #endif /* __LINUX_OPP_H__ */