From patchwork Mon Aug 10 06:32:00 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 6980091 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 405509F358 for ; Mon, 10 Aug 2015 06:33:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D55DE20392 for ; Mon, 10 Aug 2015 06:33:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E343E20328 for ; Mon, 10 Aug 2015 06:33:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753984AbbHJGdQ (ORCPT ); Mon, 10 Aug 2015 02:33:16 -0400 Received: from mail-pa0-f47.google.com ([209.85.220.47]:35181 "EHLO mail-pa0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753672AbbHJGdP (ORCPT ); Mon, 10 Aug 2015 02:33:15 -0400 Received: by pacgr6 with SMTP id gr6so19956132pac.2 for ; Sun, 09 Aug 2015 23:33:15 -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:in-reply-to:references; bh=wEW6t4H8+l3lKRQlQffMN8z+qKxkrzp/eqQQKeoWPJQ=; b=m+qkOB6BT9QnouAOCxuSEMdiIEyaQF2J1lwhkeMxVXIDS8eYmqolQ4+twlOAT2IlTl NT33thfT8U6dwqZN+j4oKNugRO8ts5tokVIfTtmWthuwXsAGqZqbGQHgf+4B7K3Nvy6v qkKOOh9nfBzlpPs9aODdj75Timg88+0fMnXbD4SsKfnobYsch4DFltkJDmh4gdK6CH/z zKtSyBJoVu7VwwevT6yOEZlpEh/us63O8TWrZLm9cjXOpAusCWcA6VB8WKMM9uNccq00 QTaem1Xk/yGB3UXnmQ4EPxKIX1V32MtkDm/s/+6wLKT33MSHZXgamv+lTkTJvJYogWUA w0dQ== X-Gm-Message-State: ALoCoQnqHZeyQo8wm6+GkxI0kdZHD2JFnzgMSTNohiC0/dNBlyOaHiYV3cjlnKABYyG+eMj1h/oI X-Received: by 10.69.25.102 with SMTP id ip6mr17206291pbd.150.1439188394874; Sun, 09 Aug 2015 23:33:14 -0700 (PDT) Received: from localhost ([223.227.137.11]) by smtp.gmail.com with ESMTPSA id bu10sm18661381pac.36.2015.08.09.23.33.11 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 09 Aug 2015 23:33:14 -0700 (PDT) From: Viresh Kumar To: Rafael Wysocki , nm@ti.com, sboyd@codeaurora.org Cc: linaro-kernel@lists.linaro.org, linux-pm@vger.kernel.org, khilman@linaro.org, Viresh Kumar , Anand Moon , Bartlomiej Zolnierkiewicz , Greg Kroah-Hartman , Len Brown , linux-kernel@vger.kernel.org (open list), Pavel Machek Subject: [PATCH 4/6] PM / OPP: Move opp core to its own directory Date: Mon, 10 Aug 2015 12:02:00 +0530 Message-Id: <6dcf599b49886fd5a2157f2e61f7424cc754b6f0.1439187821.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 2.4.0 In-Reply-To: References: In-Reply-To: References: 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, 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 OPP code is expanding and is already present in multiple directories (cpufreq and power). Lets move it to its own directory, to manage it better. This also moves/renames the cpufreq_opp file to cpu.c, as it will contain helpers for cpu device. Its not just about cpufreq, other frameworks can use OPPs as well. Signed-off-by: Viresh Kumar --- drivers/base/power/Makefile | 2 +- drivers/base/power/opp/Makefile | 2 ++ drivers/base/power/{opp.c => opp/core.c} | 0 drivers/{cpufreq/cpufreq_opp.c => base/power/opp/cpu.c} | 4 +++- drivers/cpufreq/Makefile | 1 - 5 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 drivers/base/power/opp/Makefile rename drivers/base/power/{opp.c => opp/core.c} (100%) rename drivers/{cpufreq/cpufreq_opp.c => base/power/opp/cpu.c} (97%) diff --git a/drivers/base/power/Makefile b/drivers/base/power/Makefile index f94a6ccfe787..7ff2726dab6c 100644 --- a/drivers/base/power/Makefile +++ b/drivers/base/power/Makefile @@ -1,8 +1,8 @@ obj-$(CONFIG_PM) += sysfs.o generic_ops.o common.o qos.o runtime.o wakeirq.o obj-$(CONFIG_PM_SLEEP) += main.o wakeup.o obj-$(CONFIG_PM_TRACE_RTC) += trace.o -obj-$(CONFIG_PM_OPP) += opp.o obj-$(CONFIG_PM_GENERIC_DOMAINS) += domain.o domain_governor.o obj-$(CONFIG_HAVE_CLK) += clock_ops.o +obj-$(CONFIG_PM_OPP) += opp/ ccflags-$(CONFIG_DEBUG_DRIVER) := -DDEBUG diff --git a/drivers/base/power/opp/Makefile b/drivers/base/power/opp/Makefile new file mode 100644 index 000000000000..33c1e18c41a4 --- /dev/null +++ b/drivers/base/power/opp/Makefile @@ -0,0 +1,2 @@ +ccflags-$(CONFIG_DEBUG_DRIVER) := -DDEBUG +obj-y += core.o cpu.o diff --git a/drivers/base/power/opp.c b/drivers/base/power/opp/core.c similarity index 100% rename from drivers/base/power/opp.c rename to drivers/base/power/opp/core.c diff --git a/drivers/cpufreq/cpufreq_opp.c b/drivers/base/power/opp/cpu.c similarity index 97% rename from drivers/cpufreq/cpufreq_opp.c rename to drivers/base/power/opp/cpu.c index 0f5e6d5f6da0..0dd033016e9d 100644 --- a/drivers/cpufreq/cpufreq_opp.c +++ b/drivers/base/power/opp/cpu.c @@ -1,5 +1,5 @@ /* - * Generic OPP helper interface for CPUFreq drivers + * Generic OPP helper interface for CPU device * * Copyright (C) 2009-2014 Texas Instruments Incorporated. * Nishanth Menon @@ -20,6 +20,7 @@ #include #include +#ifdef CONFIG_CPU_FREQ /** * dev_pm_opp_init_cpufreq_table() - create a cpufreq table for a device * @dev: device for which we do this operation @@ -112,3 +113,4 @@ void dev_pm_opp_free_cpufreq_table(struct device *dev, *table = NULL; } EXPORT_SYMBOL_GPL(dev_pm_opp_free_cpufreq_table); +#endif /* CONFIG_CPU_FREQ */ diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile index 2169bf792db7..2ba5b7c0bed1 100644 --- a/drivers/cpufreq/Makefile +++ b/drivers/cpufreq/Makefile @@ -1,6 +1,5 @@ # CPUfreq core obj-$(CONFIG_CPU_FREQ) += cpufreq.o freq_table.o -obj-$(CONFIG_PM_OPP) += cpufreq_opp.o # CPUfreq stats obj-$(CONFIG_CPU_FREQ_STAT) += cpufreq_stats.o