From patchwork Mon Dec 7 17:06:16 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: mark gross X-Patchwork-Id: 65550 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nB7H6M9h030217 for ; Mon, 7 Dec 2009 17:06:22 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935524AbZLGRGM (ORCPT ); Mon, 7 Dec 2009 12:06:12 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S935512AbZLGRGM (ORCPT ); Mon, 7 Dec 2009 12:06:12 -0500 Received: from mga06.intel.com ([134.134.136.21]:26356 "EHLO orsmga101.jf.intel.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S935484AbZLGRGK (ORCPT ); Mon, 7 Dec 2009 12:06:10 -0500 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP; 07 Dec 2009 09:05:16 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.47,356,1257148800"; d="scan'208";a="576394789" Received: from mgross-mobl3.jf.intel.com (HELO localhost) ([134.134.156.105]) by orsmga001.jf.intel.com with ESMTP; 07 Dec 2009 09:06:01 -0800 Date: Mon, 7 Dec 2009 09:06:16 -0800 From: mark gross To: linux-pm Cc: lkml , aili@codeaurora.org, e1000-devel@lists.sourceforge.net, bruce.w.allan@intel.com, linux-wireless@vger.kernel.org, alsa-devel@alsa-project.org, tiwai@suse.de Subject: [PATCH]PM_QOS-to-use-handle-based-requests-cpuidle-update 2/5 Message-ID: <20091207170616.GC5463@linux.intel.com> Reply-To: mgross@linux.intel.com MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index bbd066e..1f524a2 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c @@ -696,7 +696,7 @@ static int acpi_processor_power_seq_show(struct seq_file *seq, void *offset) "max_cstate: C%d\n" "maximum allowed latency: %d usec\n", pr->power.state ? pr->power.state - pr->power.states : 0, - max_cstate, pm_qos_requirement(PM_QOS_CPU_DMA_LATENCY)); + max_cstate, pm_qos_request(PM_QOS_CPU_DMA_LATENCY)); seq_puts(seq, "states:\n"); diff --git a/drivers/cpuidle/governors/ladder.c b/drivers/cpuidle/governors/ladder.c index a4bec3f..5f93084 100644 --- a/drivers/cpuidle/governors/ladder.c +++ b/drivers/cpuidle/governors/ladder.c @@ -67,7 +67,7 @@ static int ladder_select_state(struct cpuidle_device *dev) struct ladder_device *ldev = &__get_cpu_var(ladder_devices); struct ladder_device_state *last_state; int last_residency, last_idx = ldev->last_state_idx; - int latency_req = pm_qos_requirement(PM_QOS_CPU_DMA_LATENCY); + int latency_req = pm_qos_request(PM_QOS_CPU_DMA_LATENCY); if (unlikely(!ldev)) return 0; diff --git a/drivers/cpuidle/governors/menu.c b/drivers/cpuidle/governors/menu.c index 6810443..f75aec5 100644 --- a/drivers/cpuidle/governors/menu.c +++ b/drivers/cpuidle/governors/menu.c @@ -176,7 +176,7 @@ static void menu_update(struct cpuidle_device *dev); static int menu_select(struct cpuidle_device *dev) { struct menu_device *data = &__get_cpu_var(menu_devices); - int latency_req = pm_qos_requirement(PM_QOS_CPU_DMA_LATENCY); + int latency_req = pm_qos_request(PM_QOS_CPU_DMA_LATENCY); int i; int multiplier;